diff options
| author | Juan Ramos <juan@lunarg.com> | 2023-06-20 19:03:00 (GMT) |
|---|---|---|
| committer | Juan Ramos <juan@lunarg.com> | 2023-06-20 19:03:00 (GMT) |
| commit | efd8db1627631079dec02de2622071d8ec9ff5fa (patch) | |
| tree | 0b0f00df6cc8b763d15417df7264f34396f8e290 | |
| parent | 5924e5b35554342439650ec46e4506c94bc084cb (diff) | |
| download | googletest-efd8db1627631079dec02de2622071d8ec9ff5fa.zip googletest-efd8db1627631079dec02de2622071d8ec9ff5fa.tar.gz googletest-efd8db1627631079dec02de2622071d8ec9ff5fa.tar.bz2 | |
cmake: Clean up policy coderefs/pull/4290/head
Now that the min is 3.13 these policies don't need to be set
manually anymore.
CMP0054 - 3.1
CMP0063 - 3.3
CMP0069 - 3.9
CMP0077 - 3.13
| -rw-r--r-- | CMakeLists.txt | 8 | ||||
| -rw-r--r-- | googletest/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | googletest/cmake/internal_utils.cmake | 14 |
3 files changed, 0 insertions, 26 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 890e495..3b5cf3c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,14 +3,6 @@ cmake_minimum_required(VERSION 3.13) -if (POLICY CMP0069) - cmake_policy(SET CMP0069 NEW) -endif (POLICY CMP0069) - -if (POLICY CMP0077) - cmake_policy(SET CMP0077 NEW) -endif (POLICY CMP0077) - project(googletest-distribution) set(GOOGLETEST_VERSION 1.13.0) diff --git a/googletest/CMakeLists.txt b/googletest/CMakeLists.txt index e76b8c8..a944ddd 100644 --- a/googletest/CMakeLists.txt +++ b/googletest/CMakeLists.txt @@ -49,10 +49,6 @@ endif() cmake_minimum_required(VERSION 3.13) project(gtest VERSION ${GOOGLETEST_VERSION} LANGUAGES CXX C) -if (POLICY CMP0063) # Visibility - cmake_policy(SET CMP0063 NEW) -endif (POLICY CMP0063) - if (COMMAND set_up_hermetic_build) set_up_hermetic_build() endif() diff --git a/googletest/cmake/internal_utils.cmake b/googletest/cmake/internal_utils.cmake index 6573d30..4810911 100644 --- a/googletest/cmake/internal_utils.cmake +++ b/googletest/cmake/internal_utils.cmake @@ -12,14 +12,6 @@ # Test and Google Mock's option() definitions, and thus must be # called *after* the options have been defined. -if (POLICY CMP0054) - cmake_policy(SET CMP0054 NEW) -endif (POLICY CMP0054) - -if (POLICY CMP0069) - cmake_policy(SET CMP0069 NEW) -endif (POLICY CMP0069) - # Tweaks CMake's default compiler/linker settings to suit Google Test's needs. # # This must be a macro(), as inside a function string() can only @@ -264,12 +256,6 @@ function(cxx_executable name dir libs) ${name} "${cxx_default}" "${libs}" "${dir}/${name}.cc" ${ARGN}) endfunction() -# CMP0094 policy enables finding a Python executable in the LOCATION order, as -# specified by the PATH environment variable. -if (POLICY CMP0094) - cmake_policy(SET CMP0094 NEW) -endif() - # Sets PYTHONINTERP_FOUND and PYTHON_EXECUTABLE. if ("${CMAKE_VERSION}" VERSION_LESS "3.12.0") find_package(PythonInterp) |