CMakeLists.txt (googletest-release-1.10.0) | : | CMakeLists.txt (googletest-release-1.11.0) | ||
---|---|---|---|---|
# Note: CMake support is community-based. The maintainers do not use CMake | # Note: CMake support is community-based. The maintainers do not use CMake | |||
# internally. | # internally. | |||
cmake_minimum_required(VERSION 2.8.8) | cmake_minimum_required(VERSION 2.8.12) | |||
if (POLICY CMP0048) | if (POLICY CMP0048) | |||
cmake_policy(SET CMP0048 NEW) | cmake_policy(SET CMP0048 NEW) | |||
endif (POLICY CMP0048) | endif (POLICY CMP0048) | |||
project(googletest-distribution) | project(googletest-distribution) | |||
set(GOOGLETEST_VERSION 1.10.0) | set(GOOGLETEST_VERSION 1.11.0) | |||
if (CMAKE_VERSION VERSION_LESS "3.1") | if (CMAKE_VERSION VERSION_GREATER "3.0.2") | |||
add_definitions(-std=c++11) | if(NOT CYGWIN AND NOT MSYS AND NOT ${CMAKE_SYSTEM_NAME} STREQUAL QNX) | |||
else() | ||||
set(CMAKE_CXX_STANDARD 11) | ||||
set(CMAKE_CXX_STANDARD_REQUIRED ON) | ||||
if(NOT CYGWIN) | ||||
set(CMAKE_CXX_EXTENSIONS OFF) | set(CMAKE_CXX_EXTENSIONS OFF) | |||
endif() | endif() | |||
endif() | endif() | |||
enable_testing() | enable_testing() | |||
include(CMakeDependentOption) | include(CMakeDependentOption) | |||
include(GNUInstallDirs) | include(GNUInstallDirs) | |||
#Note that googlemock target already builds googletest | #Note that googlemock target already builds googletest | |||
End of changes. 3 change blocks. | ||||
8 lines changed or deleted | 4 lines changed or added |