summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGennadiy Civil <gennadiycivil@users.noreply.github.com>2017-08-16 18:26:59 (GMT)
committerGitHub <noreply@github.com>2017-08-16 18:26:58 (GMT)
commitb7e8a993b4125d1083cb431d91407d8ee4dba2ad (patch)
tree3c943d237064d795df6f4b1dc021e797c0f643bc
parent5ed471caec6f341018707e74e0dc41201fb59edd (diff)
parent9469fb687d040b60c8749b7617fee4e77c7f6409 (diff)
downloadgoogletest-b7e8a993b4125d1083cb431d91407d8ee4dba2ad.zip
googletest-b7e8a993b4125d1083cb431d91407d8ee4dba2ad.tar.gz
googletest-b7e8a993b4125d1083cb431d91407d8ee4dba2ad.tar.bz2
Merge pull request #1205 from mwoehlke-kitware/fix-gtest-install
Fix problem installing gtest when gmock enabled
-rw-r--r--CMakeLists.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 96cdade..f8a97fa 100644
--- 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)