Merge branch 'master' into josh/fix_scoped_class2

cf85f56b · Josh Bodily · GitHub · 960de715 · b7e8a993 · cf85f56b
Commit cf85f56b authored Aug 16, 2017 by Josh Bodily Committed by GitHub Aug 16, 2017
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

CMakeLists.txt CMakeLists.txt +2 -1

No files found.
--- 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)