diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2017-08-16 15:27:29 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-16 15:27:29 -0700 |
| commit | 8f233a74ebe149d4b73c6cc55f91eb5f7bf52e2c (patch) | |
| tree | 84751aa8e96b54eaf228a638d627d92a95e8ba74 | |
| parent | 5b4166f05fbc133d165b54e25fef2c88430bbc2c (diff) | |
| parent | b7e8a993b4125d1083cb431d91407d8ee4dba2ad (diff) | |
| download | googletest-8f233a74ebe149d4b73c6cc55f91eb5f7bf52e2c.tar.gz googletest-8f233a74ebe149d4b73c6cc55f91eb5f7bf52e2c.tar.bz2 googletest-8f233a74ebe149d4b73c6cc55f91eb5f7bf52e2c.zip | |
Merge branch 'master' into methodname-in-exception
| -rw-r--r-- | CMakeLists.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 96cdadef..f8a97faa 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) |