mirror of
https://github.com/google/googletest.git
synced 2024-12-26 17:41:03 +08:00
Merge pull request #4290 from juan-lunarg:juan/cmake_version_cleanup
PiperOrigin-RevId: 542045766 Change-Id: Ib6e0fffdbf1f41fb990603fe2af7c6d5df6b5640
This commit is contained in:
commit
fb11778f43
@ -3,14 +3,6 @@
|
|||||||
|
|
||||||
cmake_minimum_required(VERSION 3.13)
|
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)
|
project(googletest-distribution)
|
||||||
set(GOOGLETEST_VERSION 1.13.0)
|
set(GOOGLETEST_VERSION 1.13.0)
|
||||||
|
|
||||||
|
@ -49,10 +49,6 @@ endif()
|
|||||||
cmake_minimum_required(VERSION 3.13)
|
cmake_minimum_required(VERSION 3.13)
|
||||||
project(gtest VERSION ${GOOGLETEST_VERSION} LANGUAGES CXX C)
|
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)
|
if (COMMAND set_up_hermetic_build)
|
||||||
set_up_hermetic_build()
|
set_up_hermetic_build()
|
||||||
endif()
|
endif()
|
||||||
|
@ -12,14 +12,6 @@
|
|||||||
# Test and Google Mock's option() definitions, and thus must be
|
# Test and Google Mock's option() definitions, and thus must be
|
||||||
# called *after* the options have been defined.
|
# 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.
|
# 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
|
# 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})
|
${name} "${cxx_default}" "${libs}" "${dir}/${name}.cc" ${ARGN})
|
||||||
endfunction()
|
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.
|
# Sets PYTHONINTERP_FOUND and PYTHON_EXECUTABLE.
|
||||||
if ("${CMAKE_VERSION}" VERSION_LESS "3.12.0")
|
if ("${CMAKE_VERSION}" VERSION_LESS "3.12.0")
|
||||||
find_package(PythonInterp)
|
find_package(PythonInterp)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user