Avoid installing googletest, request v1.8.1

asrob-uc3m · May 12, 2019 · 198deb6 · 198deb6
1 parent 6f201c1
commit 198deb6
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -44,7 +44,7 @@ init:
   - cmd: set SDL2_TTF_LATEST=2.0.14
   - cmd: set SDL2_MIXER_LATEST=2.0.2
   - cmd: set ZBAR_LATEST=0.10-rd1
-  - cmd: set GTEST_LATEST=1.8.0
+  - cmd: set GTEST_LATEST=1.8.1
 
   # Download/clone paths and URLs
   - cmd: set CLONES_PATH=C:\git

diff --git a/cmake/find-modules/FindGTestSources.cmake b/cmake/find-modules/FindGTestSources.cmake
@@ -19,15 +19,18 @@
 #
 # * gtest_add_tests (as in FindGTest.cmake)
 
+if(POLICY CMP0074)
+    cmake_policy(SET CMP0074 NEW)
+endif()
+
 find_package(GTest QUIET)
 
 if(NOT GTestSources_SOURCE_DIR)
-    find_path(GTestSources_SOURCE_DIR src/gtest.cc
+    find_path(GTestSources_SOURCE_DIR CMakeLists.txt
                                       HINTS $ENV{GTEST_ROOT}
                                             ${GTEST_ROOT}
                                       PATHS /usr/src/gtest
-                                            /usr/src/googletest
-                                      PATH_SUFFIXES googletest)
+                                            /usr/src/googletest)
 endif()
 
 if(NOT GTestSources_INCLUDE_DIR)
@@ -37,6 +40,7 @@ if(NOT GTestSources_INCLUDE_DIR)
                                              $ENV{GTEST_ROOT}
                                              ${GTEST_ROOT}
                                        PATH_SUFFIXES include
+                                                     googletest/include
                                        NO_CMAKE_PATH
                                        NO_CMAKE_ENVIRONMENT_PATH)
 endif()

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -10,8 +10,11 @@ cmake_dependent_option(ENABLE_tests "Enable/disable unit tests" ON
                        GTestSources_FOUND OFF)
 
 if(ENABLE_tests)
-    
+
 set(gtest_force_shared_crt ON CACHE INTERNAL "") # needed for Windows
+set(BUILD_GMOCK OFF CACHE INTERNAL "")
+set(INSTALL_GTEST OFF CACHE INTERNAL "")
+
 add_subdirectory(${GTestSources_SOURCE_DIR} ${CMAKE_BINARY_DIR}/gtest)
 
 include_directories(${GTestSources_INCLUDE_DIR})