forked from conan-io/conan-center-index
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
(conan-io#6383) abseil: add shared option + fix link to libm + drop f…
…ew patch versions + modernize * add shared option * system libs for FreeBSD and iOS/tvOS/watchOS * move checks to validate() * stop maintenance of unofficial version 20200205 * fix abseil_dll component for windows shared build * stop maintenance of unofficial version 20200205 * finer grained export of patches * drop 20200205 in config.yml as well * modernize * absl-string may link to libm * drop maintenance of several patch versions keep last patch of each "major" version * drop shared with msvc for the moment * ensure C++ standard consistency revert conan-io#7443 it's almost impossible to predict if those headers are available. abseil has a mechanism to detect these headers, trust it. Since we are trying very hard to inject at build time the default C++ standard of the compiler or the one given in profile, it should be fine.
- Loading branch information
Showing
12 changed files
with
138 additions
and
120 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
File renamed without changes.
File renamed without changes.
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 |
---|---|---|
@@ -0,0 +1,15 @@ | ||
--- a/absl/strings/CMakeLists.txt | ||
+++ b/absl/strings/CMakeLists.txt | ||
@@ -14,9 +14,12 @@ | ||
# limitations under the License. | ||
# | ||
|
||
+find_library(LIBM m) | ||
absl_cc_library( | ||
NAME | ||
strings | ||
+ LINKOPTS | ||
+ $<$<BOOL:${LIBM}>:-lm> | ||
HDRS | ||
"ascii.h" | ||
"charconv.h" |
15 changes: 15 additions & 0 deletions
15
recipes/abseil/all/patches/0004-cpp-standard-20200225.patch
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 |
---|---|---|
@@ -0,0 +1,15 @@ | ||
--- a/CMake/AbseilHelpers.cmake | ||
+++ b/CMake/AbseilHelpers.cmake | ||
@@ -204,8 +204,12 @@ function(absl_cc_library) | ||
endif() | ||
|
||
# INTERFACE libraries can't have the CXX_STANDARD property set | ||
+ if(ABSL_PROPAGATE_CXX_STD) | ||
+ target_compile_features(${_NAME} PUBLIC cxx_std_11) | ||
+ else() | ||
set_property(TARGET ${_NAME} PROPERTY CXX_STANDARD ${ABSL_CXX_STANDARD}) | ||
set_property(TARGET ${_NAME} PROPERTY CXX_STANDARD_REQUIRED ON) | ||
+ endif() | ||
|
||
# When being installed, we lose the absl_ prefix. We want to put it back | ||
# to have properly named lib files. This is a no-op when we are not being |
15 changes: 15 additions & 0 deletions
15
recipes/abseil/all/patches/0004-cpp-standard-20200923.patch
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 |
---|---|---|
@@ -0,0 +1,15 @@ | ||
--- a/CMake/AbseilHelpers.cmake | ||
+++ b/CMake/AbseilHelpers.cmake | ||
@@ -206,8 +206,12 @@ function(absl_cc_library) | ||
endif() | ||
|
||
# INTERFACE libraries can't have the CXX_STANDARD property set | ||
+ if(ABSL_PROPAGATE_CXX_STD) | ||
+ target_compile_features(${_NAME} PUBLIC cxx_std_11) | ||
+ else() | ||
set_property(TARGET ${_NAME} PROPERTY CXX_STANDARD ${ABSL_CXX_STANDARD}) | ||
set_property(TARGET ${_NAME} PROPERTY CXX_STANDARD_REQUIRED ON) | ||
+ endif() | ||
|
||
# When being installed, we lose the absl_ prefix. We want to put it back | ||
# to have properly named lib files. This is a no-op when we are not being |
15 changes: 15 additions & 0 deletions
15
recipes/abseil/all/patches/0004-cpp-standard-20210324.patch
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 |
---|---|---|
@@ -0,0 +1,15 @@ | ||
--- a/CMake/AbseilHelpers.cmake | ||
+++ b/CMake/AbseilHelpers.cmake | ||
@@ -254,8 +254,12 @@ Cflags: -I\${includedir}${PC_CFLAGS}\n") | ||
endif() | ||
|
||
# INTERFACE libraries can't have the CXX_STANDARD property set | ||
+ if(ABSL_PROPAGATE_CXX_STD) | ||
+ target_compile_features(${_NAME} PUBLIC cxx_std_11) | ||
+ else() | ||
set_property(TARGET ${_NAME} PROPERTY CXX_STANDARD ${ABSL_CXX_STANDARD}) | ||
set_property(TARGET ${_NAME} PROPERTY CXX_STANDARD_REQUIRED ON) | ||
+ endif() | ||
|
||
# When being installed, we lose the absl_ prefix. We want to put it back | ||
# to have properly named lib files. This is a no-op when we are not being |
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