Index: ext/googletest/CMakeLists.txt =================================================================== diff -u -N -r4a481bbe77043e0bda2435c6d62a02700b3e46c5 -r2e4eacb299f21d06196fe13140b4b0d095abdca9 --- ext/googletest/CMakeLists.txt (.../CMakeLists.txt) (revision 4a481bbe77043e0bda2435c6d62a02700b3e46c5) +++ ext/googletest/CMakeLists.txt (.../CMakeLists.txt) (revision 2e4eacb299f21d06196fe13140b4b0d095abdca9) @@ -1,16 +1,23 @@ -cmake_minimum_required(VERSION 2.6.2) +cmake_minimum_required(VERSION 2.8.8) -project( googletest-distribution ) +if (POLICY CMP0048) + cmake_policy(SET CMP0048 NEW) +endif (POLICY CMP0048) +project(googletest-distribution) +set(GOOGLETEST_VERSION 1.9.0) + enable_testing() -option(BUILD_GTEST "Builds the googletest subproject" OFF) +include(CMakeDependentOption) +include(GNUInstallDirs) #Note that googlemock target already builds googletest option(BUILD_GMOCK "Builds the googlemock subproject" ON) +option(INSTALL_GTEST "Enable installation of googletest. (Projects embedding googletest may want to turn this OFF.)" ON) if(BUILD_GMOCK) add_subdirectory( googlemock ) -elseif(BUILD_GTEST) +else() add_subdirectory( googletest ) endif()