diff options
| author | Josh Bodily <joshbodily@gmail.com> | 2017-08-16 17:00:47 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-16 17:00:47 -0600 |
| commit | cf85f56b2159d7c964dacb3e311163a6f9520688 (patch) | |
| tree | 95fb73e8e3d1437a67c00c365cb07451c327c6b1 | |
| parent | 960de7151241c2140b32c171298444cc07de1325 (diff) | |
| parent | b7e8a993b4125d1083cb431d91407d8ee4dba2ad (diff) | |
| download | googletest-cf85f56b2159d7c964dacb3e311163a6f9520688.tar.gz googletest-cf85f56b2159d7c964dacb3e311163a6f9520688.tar.bz2 googletest-cf85f56b2159d7c964dacb3e311163a6f9520688.zip | |
Merge branch 'master' into josh/fix_scoped_class2
| -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) |