diff options
author | Abseil Team <absl-team@google.com> | 2019-03-28 11:12:19 -0700 |
---|---|---|
committer | Gennadiy Civil <misterg@google.com> | 2019-03-28 16:54:11 -0400 |
commit | 2c8421e1c6cef0da9e8a20b01c15256ec9ec116d (patch) | |
tree | 3325b53470a6de6e08c3d2552233e19564d81c5f /CMake | |
parent | 5b65c4af5107176555b23a638e5947686410ac1f (diff) |
Export of internal Abseil changes.
--
fcf9d3facb12451964ad1850073cbfb6f9739379 by CJ Johnson <johnsoncj@google.com>:
Makes it obvious to readers that the comparison operators do not branch more than needed
PiperOrigin-RevId: 240811527
--
680c586f81f805be68e96caffb28d5f46b6a6511 by Jon Cohen <cohenjon@google.com>:
Consistently use "if(" instead of "if (" in CMake files
PiperOrigin-RevId: 240621819
--
c4acc506648622389f33f564fd94f8dda08cb61a by Tom Manshreck <shreck@google.com>:
Internal change
PiperOrigin-RevId: 240619556
--
ddbc1894944aae96767c876a1ae8696ddaba42a2 by Jon Cohen <cohenjon@google.com>:
Remove the warning about install prefixes when we aren't installing abseil
PiperOrigin-RevId: 240614750
--
086c4fad213d99e875038bc8a1c7268e28a7ebf3 by Abseil Team <absl-team@google.com>:
Adjust some tests and test cases which fail on WebAssembly
PiperOrigin-RevId: 240592367
--
46c2c09723a37ef4911ae3c64aab92e3f0fdba79 by Abseil Team <absl-team@google.com>:
CMake install target update
- Add prefix absl_ to each target when install rule are disabled.
- Disable all install commands when absl is used as subdirectory (Fix #287)
PiperOrigin-RevId: 240575083
--
8d88063ed5b16f982a91950693d37ca18fdd46d8 by Jon Cohen <cohenjon@google.com>:
Correctly link to Threads::Threads for a few cmake targets which were missing it.
PiperOrigin-RevId: 240574513
GitOrigin-RevId: fcf9d3facb12451964ad1850073cbfb6f9739379
Change-Id: I031c57de8cd88554348eb8bd1371d01d15ff1fc7
Diffstat (limited to 'CMake')
-rw-r--r-- | CMake/AbseilHelpers.cmake | 16 | ||||
-rw-r--r-- | CMake/AbseilInstallDirs.cmake | 2 | ||||
-rw-r--r-- | CMake/abslConfig.cmake.in | 5 |
3 files changed, 14 insertions, 9 deletions
diff --git a/CMake/AbseilHelpers.cmake b/CMake/AbseilHelpers.cmake index be9a0e9c..58f98c8c 100644 --- a/CMake/AbseilHelpers.cmake +++ b/CMake/AbseilHelpers.cmake @@ -59,7 +59,7 @@ set(ABSL_IDE_FOLDER Abseil) # SRCS # "b.cc" # DEPS -# absl_internal_awesome # not "awesome"! +# absl::awesome # not "awesome" ! # PUBLIC # ) # @@ -68,7 +68,7 @@ set(ABSL_IDE_FOLDER Abseil) # main_lib # ... # DEPS -# absl::fantastic_lib # since fantastic_lib is public +# absl::fantastic_lib # ) # # TODO: Implement "ALWAYSLINK" @@ -80,8 +80,12 @@ function(absl_cc_library) ${ARGN} ) - if (NOT ABSL_CC_LIB_TESTONLY OR ABSL_RUN_TESTS) - set(_NAME "${ABSL_CC_LIB_NAME}") + if(NOT ABSL_CC_LIB_TESTONLY OR ABSL_RUN_TESTS) + if(ABSL_ENABLE_INSTALL) + set(_NAME "${ABSL_CC_LIB_NAME}") + else() + set(_NAME "absl_${ABSL_CC_LIB_NAME}") + endif() # Check if this is a header-only library # Note that as of February 2019, many popular OS's (for example, Ubuntu @@ -93,7 +97,7 @@ function(absl_cc_library) list(REMOVE_ITEM ABSL_CC_SRCS "${src_file}") endif() endforeach() - if ("${ABSL_CC_SRCS}" STREQUAL "") + if("${ABSL_CC_SRCS}" STREQUAL "") set(ABSL_CC_LIB_IS_INTERFACE 1) else() set(ABSL_CC_LIB_IS_INTERFACE 0) @@ -155,7 +159,7 @@ function(absl_cc_library) # TODO currently we don't install googletest alongside abseil sources, so # installed abseil can't be tested. - if (NOT ABSL_CC_LIB_TESTONLY) + if(NOT ABSL_CC_LIB_TESTONLY AND ABSL_ENABLE_INSTALL) install(TARGETS ${_NAME} EXPORT ${PROJECT_NAME}Targets RUNTIME DESTINATION ${ABSL_INSTALL_BINDIR} LIBRARY DESTINATION ${ABSL_INSTALL_LIBDIR} diff --git a/CMake/AbseilInstallDirs.cmake b/CMake/AbseilInstallDirs.cmake index 5b67008b..b67272f8 100644 --- a/CMake/AbseilInstallDirs.cmake +++ b/CMake/AbseilInstallDirs.cmake @@ -6,7 +6,7 @@ include(GNUInstallDirs) # Abseil's internal Copybara (https://github.com/google/copybara) workflows and # isn't visible in the CMake buildsystem itself. -if (absl_VERSION) +if(absl_VERSION) set(ABSL_SUBDIR "${PROJECT_NAME}_${PROJECT_VERSION}") set(ABSL_INSTALL_BINDIR "${CMAKE_INSTALL_BINDIR}/${ABSL_SUBDIR}") set(ABSL_INSTALL_CONFIGDIR "${CMAKE_INSTALL_LIBDIR}/cmake/${ABSL_SUBDIR}") diff --git a/CMake/abslConfig.cmake.in b/CMake/abslConfig.cmake.in index bf8c4f6a..60847fa7 100644 --- a/CMake/abslConfig.cmake.in +++ b/CMake/abslConfig.cmake.in @@ -1,5 +1,6 @@ -## absl CMake configuration file. Note that there is no corresponding -# abslConfigVersion.cmake since non-LTS Abseil isn't versioned. +# absl CMake configuration file. + +include(FindThreads) @PACKAGE_INIT@ |