diff options
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 be9a0e9ccf37..58f98c8c3857 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 5b67008bc68c..b67272f830c1 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 bf8c4f6a0ec9..60847fa7723f 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@ |