Skip to content

Commit fb11778

Browse files
Merge pull request #4290 from juan-lunarg:juan/cmake_version_cleanup
PiperOrigin-RevId: 542045766 Change-Id: Ib6e0fffdbf1f41fb990603fe2af7c6d5df6b5640
2 parents 5924e5b + efd8db1 commit fb11778

File tree

3 files changed

+0
-26
lines changed

3 files changed

+0
-26
lines changed

CMakeLists.txt

-8
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,6 @@
33

44
cmake_minimum_required(VERSION 3.13)
55

6-
if (POLICY CMP0069)
7-
cmake_policy(SET CMP0069 NEW)
8-
endif (POLICY CMP0069)
9-
10-
if (POLICY CMP0077)
11-
cmake_policy(SET CMP0077 NEW)
12-
endif (POLICY CMP0077)
13-
146
project(googletest-distribution)
157
set(GOOGLETEST_VERSION 1.13.0)
168

googletest/CMakeLists.txt

-4
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,6 @@ endif()
4949
cmake_minimum_required(VERSION 3.13)
5050
project(gtest VERSION ${GOOGLETEST_VERSION} LANGUAGES CXX C)
5151

52-
if (POLICY CMP0063) # Visibility
53-
cmake_policy(SET CMP0063 NEW)
54-
endif (POLICY CMP0063)
55-
5652
if (COMMAND set_up_hermetic_build)
5753
set_up_hermetic_build()
5854
endif()

googletest/cmake/internal_utils.cmake

-14
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,6 @@
1212
# Test and Google Mock's option() definitions, and thus must be
1313
# called *after* the options have been defined.
1414

15-
if (POLICY CMP0054)
16-
cmake_policy(SET CMP0054 NEW)
17-
endif (POLICY CMP0054)
18-
19-
if (POLICY CMP0069)
20-
cmake_policy(SET CMP0069 NEW)
21-
endif (POLICY CMP0069)
22-
2315
# Tweaks CMake's default compiler/linker settings to suit Google Test's needs.
2416
#
2517
# This must be a macro(), as inside a function string() can only
@@ -264,12 +256,6 @@ function(cxx_executable name dir libs)
264256
${name} "${cxx_default}" "${libs}" "${dir}/${name}.cc" ${ARGN})
265257
endfunction()
266258

267-
# CMP0094 policy enables finding a Python executable in the LOCATION order, as
268-
# specified by the PATH environment variable.
269-
if (POLICY CMP0094)
270-
cmake_policy(SET CMP0094 NEW)
271-
endif()
272-
273259
# Sets PYTHONINTERP_FOUND and PYTHON_EXECUTABLE.
274260
if ("${CMAKE_VERSION}" VERSION_LESS "3.12.0")
275261
find_package(PythonInterp)

0 commit comments

Comments
 (0)