-
Notifications
You must be signed in to change notification settings - Fork 1.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
(#4776) protobuf: allow shared on Macos + add protobuf::protoc import…
…ed target * really provide protobuf::protoc target * cosmetic change * simplify check of runtime * properly handle protobuf with zlib previous injection of lib directories was too fragile. It breaks as soon as there is a dependency * append to builddirs * cleanup * fix semicolon replacement * more robust DYLD_LIBRARY_PATH injection * cosmetic change * improve runtime handling * no protobuf_BUILD_LIBPROTOC option before 3.14.0 * honor upstream default value for with_zlib * add protobuf/3.15.4 * provide Protobuf_PROTOC_EXECUTABLE CACHE variable * trick to no break pkg_config generator internal handling in conan * workaround for invalid-constexpr with clang * clang < 4 not supported in recent protobuf * cleanup * do not disable rtti by default * Revert "workaround for invalid-constexpr with clang" This reverts commit dc170c4. * remove useless test of find_program * use TARGET_FILE in apple patch * add 3.15.5 instead of 3.15.4 * add rtti option if protobuf >= 3.15.4 * removed duplicated version * empty commit * keep find_program protoc logic for cross compilation
- Loading branch information
Showing
4 changed files
with
91 additions
and
87 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
from conans import ConanFile, CMake, RunEnvironment, tools | ||
from conans import ConanFile, CMake, tools | ||
import os | ||
|
||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,11 @@ | ||
versions: | ||
3.9.1: | ||
"3.9.1": | ||
folder: all | ||
3.11.4: | ||
"3.11.4": | ||
folder: all | ||
3.12.4: | ||
"3.12.4": | ||
folder: all | ||
3.13.0: | ||
"3.13.0": | ||
folder: all | ||
3.15.5: | ||
"3.15.5": | ||
folder: all |