From e60c9f7fda5e5570881be7e8945ff5b4ec3a1e8a Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Thu, 12 Jan 2017 10:18:56 +0000 Subject: Change search priority for newer Googletest releases (bzr r15412) --- CMakeLists.txt | 7 ++++--- 1 file 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) -- cgit v1.2.3