diff options
| author | Alex Valavanis <valavanisalex@gmail.com> | 2017-01-12 10:18:56 +0000 |
|---|---|---|
| committer | Alexander Valavanis <valavanisalex@gmail.com> | 2017-01-12 10:18:56 +0000 |
| commit | e60c9f7fda5e5570881be7e8945ff5b4ec3a1e8a (patch) | |
| tree | 7575904f8161fc69ee8c1a3d429b39d0939f9d24 | |
| parent | [Bug #1651815] share/examples: rescale svgs to 96 dpi. Fixing incorrectly sca... (diff) | |
| download | inkscape-e60c9f7fda5e5570881be7e8945ff5b4ec3a1e8a.tar.gz inkscape-e60c9f7fda5e5570881be7e8945ff5b4ec3a1e8a.zip | |
Change search priority for newer Googletest releases
(bzr r15412)
| -rw-r--r-- | CMakeLists.txt | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index e9f1986b4..92e650b26 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -79,11 +79,12 @@ include(CMakeScripts/ConfigPaths.cmake) # Installation Paths 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" + PATHS "$ENV{GMOCK_DIR}" + "/usr/src/googletest/googlemock" + "/usr/src/gmock" + "${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) |