summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Valavanis <valavanisalex@gmail.com>2017-01-11 15:36:51 +0000
committerAlex Valavanis <valavanisalex@gmail.com>2017-01-11 15:36:51 +0000
commit1ddb154aebd50c228f307fb45132ab1e5491ad30 (patch)
treea3f330e98f1b4d0aec93615f5a19925ad4ffec07
parentfix comment typos (diff)
downloadinkscape-1ddb154aebd50c228f307fb45132ab1e5491ad30.tar.gz
inkscape-1ddb154aebd50c228f307fb45132ab1e5491ad30.zip
Improve search for GMock src
(bzr r15409)
-rw-r--r--CMakeLists.txt10
1 files changed, 8 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 612423ef0..e9f1986b4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -76,8 +76,14 @@ include(CMakeScripts/ConfigPaths.cmake) # Installation Paths
# -----------------------------------------------------------------------------
# Test Harness
# -----------------------------------------------------------------------------
-set(GMOCK_DIR "${CMAKE_SOURCE_DIR}/gtest/gmock-1.7.0"
- CACHE PATH "The path to the GoogleMock test framework.")
+if(NOT GMOCK_DIR)
+ find_path(GMOCK_DIR
+ NAMES src/gmock.cc
+ PATHS "$ENV{GMOCK_DIR}" "/usr/src/gmock" "/usr/src/googletest/googlemock" "${CMAKE_SOURCE_DIR}/gtest/gmock-1.7.0"
+ )
+endif(NOT GMOCK_DIR)
+#set(GMOCK_DIR "${CMAKE_SOURCE_DIR}/gtest/gmock-1.7.0"
+# CACHE PATH "The path to the GoogleMock test framework.")
if(EXISTS "${GMOCK_DIR}" AND IS_DIRECTORY "${GMOCK_DIR}")
set(GMOCK_PRESENT ON)