diff options
| author | Dino Radaković <dinor@google.com> | 2021-03-30 04:29:19 (GMT) |
|---|---|---|
| committer | Dino Radaković <dinor@google.com> | 2021-03-30 04:29:19 (GMT) |
| commit | 6c5c4554ac218a8e19168edc121b1ad232015185 (patch) | |
| tree | e4aeba2a1fbf6d0e1b42eb2a1a99971221ccb471 | |
| parent | df7fee587d442b372ef43bd66c6a2f5c9af8c5eb (diff) | |
| parent | 2292b6d856335b6c1ee352e9cb97d7a5b193c989 (diff) | |
| download | googletest-6c5c4554ac218a8e19168edc121b1ad232015185.zip googletest-6c5c4554ac218a8e19168edc121b1ad232015185.tar.gz googletest-6c5c4554ac218a8e19168edc121b1ad232015185.tar.bz2 | |
Merge pull request #3155 from ZedThree:cmake-alias-libraries
PiperOrigin-RevId: 365572439
| -rw-r--r-- | googletest/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | googletest/cmake/internal_utils.cmake | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/googletest/CMakeLists.txt b/googletest/CMakeLists.txt index 1379afb..abdd98b 100644 --- a/googletest/CMakeLists.txt +++ b/googletest/CMakeLists.txt @@ -92,10 +92,13 @@ include(cmake/internal_utils.cmake) config_compiler_and_linker() # Defined in internal_utils.cmake. +# Needed to set the namespace for both the export targets and the +# alias libraries +set(cmake_package_name GTest CACHE INTERNAL "") + # Create the CMake package file descriptors. if (INSTALL_GTEST) include(CMakePackageConfigHelpers) - set(cmake_package_name GTest) set(targets_export_name ${cmake_package_name}Targets CACHE INTERNAL "") set(generated_dir "${CMAKE_CURRENT_BINARY_DIR}/generated" CACHE INTERNAL "") set(cmake_files_install_dir "${CMAKE_INSTALL_LIBDIR}/cmake/${cmake_package_name}") diff --git a/googletest/cmake/internal_utils.cmake b/googletest/cmake/internal_utils.cmake index dc2b685..8d8d60a 100644 --- a/googletest/cmake/internal_utils.cmake +++ b/googletest/cmake/internal_utils.cmake @@ -150,6 +150,7 @@ function(cxx_library_with_type name type cxx_flags) # type can be either STATIC or SHARED to denote a static or shared library. # ARGN refers to additional arguments after 'cxx_flags'. add_library(${name} ${type} ${ARGN}) + add_library(${cmake_package_name}::${name} ALIAS ${name}) set_target_properties(${name} PROPERTIES COMPILE_FLAGS "${cxx_flags}") |