diff options
| author | Gennadiy Rozental <rogeeff@google.com> | 2020-06-03 00:45:20 (GMT) |
|---|---|---|
| committer | Gennadiy Rozental <rogeeff@google.com> | 2020-06-03 00:45:20 (GMT) |
| commit | cb44c86c1aaf31b26797728e93acc950c01dbd5b (patch) | |
| tree | 4adaef07ba4fe00a5f3b5afbc55817b56cb9daa7 | |
| parent | 26dadc2241b1d67e0cd3690f8ef90cd1e4294d03 (diff) | |
| parent | 94a7cf8c57e48caa9c120e8147c78ba7c4915050 (diff) | |
| download | googletest-cb44c86c1aaf31b26797728e93acc950c01dbd5b.zip googletest-cb44c86c1aaf31b26797728e93acc950c01dbd5b.tar.gz googletest-cb44c86c1aaf31b26797728e93acc950c01dbd5b.tar.bz2 | |
Merge pull request #2755 from Conan-Kudo:set-version-for-libs
PiperOrigin-RevId: 314427570
| -rw-r--r-- | googlemock/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | googletest/CMakeLists.txt | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/googlemock/CMakeLists.txt b/googlemock/CMakeLists.txt index 8ab59d7..079c8c9 100644 --- a/googlemock/CMakeLists.txt +++ b/googlemock/CMakeLists.txt @@ -100,8 +100,10 @@ if (MSVC) else() cxx_library(gmock "${cxx_strict}" src/gmock-all.cc) target_link_libraries(gmock PUBLIC gtest) + set_target_properties(gmock PROPERTIES VERSION ${GOOGLETEST_VERSION}) cxx_library(gmock_main "${cxx_strict}" src/gmock_main.cc) target_link_libraries(gmock_main PUBLIC gmock) + set_target_properties(gmock_main PROPERTIES VERSION ${GOOGLETEST_VERSION}) endif() # If the CMake version supports it, attach header directory information # to the targets for when we are part of a parent build (ie being pulled diff --git a/googletest/CMakeLists.txt b/googletest/CMakeLists.txt index 4fd7b52..f538c96 100644 --- a/googletest/CMakeLists.txt +++ b/googletest/CMakeLists.txt @@ -126,7 +126,9 @@ include_directories(${gtest_build_include_dirs}) # are used for other targets, to ensure that gtest can be compiled by a user # aggressive about warnings. cxx_library(gtest "${cxx_strict}" src/gtest-all.cc) +set_target_properties(gtest PROPERTIES VERSION ${GOOGLETEST_VERSION}) cxx_library(gtest_main "${cxx_strict}" src/gtest_main.cc) +set_target_properties(gtest_main PROPERTIES VERSION ${GOOGLETEST_VERSION}) # If the CMake version supports it, attach header directory information # to the targets for when we are part of a parent build (ie being pulled # in via add_subdirectory() rather than being a standalone build). |