Merge branch 'master' into methodname-in-exception

7 years ago · 8f233a74eb
parent 5b4166f05f b7e8a993b4
commit 8f233a74eb
1 changed files with 2 additions and 1 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -19,10 +19,11 @@ else()
 endif()

 option(BUILD_GTEST "Builds the googletest subproject" OFF)
-cmake_dependent_option(INSTALL_GTEST "Enable installation of googletest. (Projects embedding googletest may want to turn this OFF.)" ON "BUILD_GTEST OR BUILD_GMOCK" OFF)

 #Note that googlemock target already builds googletest
 option(BUILD_GMOCK "Builds the googlemock subproject" ON)
+
+cmake_dependent_option(INSTALL_GTEST "Enable installation of googletest. (Projects embedding googletest may want to turn this OFF.)" ON "BUILD_GTEST OR BUILD_GMOCK" OFF)
 cmake_dependent_option(INSTALL_GMOCK "Enable installation of googlemock. (Projects embedding googlemock may want to turn this OFF.)" ON "BUILD_GMOCK" OFF)

 if(BUILD_GMOCK)