diff options
| author | Copybara-Service <copybara-worker@google.com> | 2023-06-20 15:20:43 (GMT) |
|---|---|---|
| committer | Copybara-Service <copybara-worker@google.com> | 2023-06-20 15:20:43 (GMT) |
| commit | 29836977ef1c664588daeb035591c18a912e7c50 (patch) | |
| tree | 213bfae7d42f084d4d3b44fb3c1c916514d69812 | |
| parent | 6c088164163ea07406d07d34acaa29ede0b55cf2 (diff) | |
| parent | 4fed5f285030085b096c930ff03e42c7814739b2 (diff) | |
| download | googletest-29836977ef1c664588daeb035591c18a912e7c50.zip googletest-29836977ef1c664588daeb035591c18a912e7c50.tar.gz googletest-29836977ef1c664588daeb035591c18a912e7c50.tar.bz2 | |
Merge pull request #4288 from juan-lunarg:juan/cmake_min_3_dot_6
PiperOrigin-RevId: 541929012
Change-Id: I90423820611c2b6a6f81fe3f9ec2d23992ffbed1
| -rw-r--r-- | CMakeLists.txt | 6 | ||||
| -rw-r--r-- | docs/pkgconfig.md | 14 | ||||
| -rw-r--r-- | googlemock/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | googletest/CMakeLists.txt | 3 |
4 files changed, 8 insertions, 18 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 6af4143..890e495 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,11 +1,7 @@ # Note: CMake support is community-based. The maintainers do not use CMake # internally. -cmake_minimum_required(VERSION 3.5) - -if (POLICY CMP0048) - cmake_policy(SET CMP0048 NEW) -endif (POLICY CMP0048) +cmake_minimum_required(VERSION 3.13) if (POLICY CMP0069) cmake_policy(SET CMP0069 NEW) diff --git a/docs/pkgconfig.md b/docs/pkgconfig.md index 18a2546..bf05d59 100644 --- a/docs/pkgconfig.md +++ b/docs/pkgconfig.md @@ -19,19 +19,15 @@ examples here we assume you want to compile the sample Using `pkg-config` in CMake is fairly easy: ```cmake -cmake_minimum_required(VERSION 3.0) - -cmake_policy(SET CMP0048 NEW) -project(my_gtest_pkgconfig VERSION 0.0.1 LANGUAGES CXX) - find_package(PkgConfig) pkg_search_module(GTEST REQUIRED gtest_main) -add_executable(testapp samples/sample3_unittest.cc) -target_link_libraries(testapp ${GTEST_LDFLAGS}) -target_compile_options(testapp PUBLIC ${GTEST_CFLAGS}) +add_executable(testapp) +target_sources(testapp PRIVATE samples/sample3_unittest.cc) +target_link_libraries(testapp PRIVATE ${GTEST_LDFLAGS}) +target_compile_options(testapp PRIVATE ${GTEST_CFLAGS}) -include(CTest) +enable_testing() add_test(first_and_only_test testapp) ``` diff --git a/googlemock/CMakeLists.txt b/googlemock/CMakeLists.txt index 5c1f0da..5833d20 100644 --- a/googlemock/CMakeLists.txt +++ b/googlemock/CMakeLists.txt @@ -36,8 +36,7 @@ endif() # as ${gmock_SOURCE_DIR} and to the root binary directory as # ${gmock_BINARY_DIR}. # Language "C" is required for find_package(Threads). -cmake_minimum_required(VERSION 3.5) -cmake_policy(SET CMP0048 NEW) +cmake_minimum_required(VERSION 3.13) project(gmock VERSION ${GOOGLETEST_VERSION} LANGUAGES CXX C) if (COMMAND set_up_hermetic_build) diff --git a/googletest/CMakeLists.txt b/googletest/CMakeLists.txt index d06c147..e76b8c8 100644 --- a/googletest/CMakeLists.txt +++ b/googletest/CMakeLists.txt @@ -46,8 +46,7 @@ endif() # Project version: -cmake_minimum_required(VERSION 3.5) -cmake_policy(SET CMP0048 NEW) +cmake_minimum_required(VERSION 3.13) project(gtest VERSION ${GOOGLETEST_VERSION} LANGUAGES CXX C) if (POLICY CMP0063) # Visibility |