From 5f53e2926ac0a302063cb8f53c82a3d8de153231 Mon Sep 17 00:00:00 2001 From: goodvibes2 Date: Mon, 11 Jun 2018 18:30:04 +1000 Subject: [PATCH] Use HINTS instead of PATHS to tell cmake where to look for GTEST + GMOCK files so it selects the paths in GTEST_ROOT + GMOCK_ROOT rather than the system libraries. --- common/cmake_modules/GncAddTest.cmake | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/common/cmake_modules/GncAddTest.cmake b/common/cmake_modules/GncAddTest.cmake index 169c426342..ea126a76dc 100644 --- a/common/cmake_modules/GncAddTest.cmake +++ b/common/cmake_modules/GncAddTest.cmake @@ -125,9 +125,9 @@ function(gnc_gtest_configure) set(GMOCK_ROOT $ENV{GMOCK_ROOT}) endif() find_path(GTEST_INCLUDE_DIR gtest/gtest.h - PATHS ${GTEST_ROOT}/include ${GMOCK_ROOT}/gtest/include /usr/include) + HINTS ${GTEST_ROOT}/include ${GMOCK_ROOT}/gtest/include /usr/include) find_path(GTEST_SRC_DIR src/gtest-all.cc - PATHS ${GTEST_ROOT} ${GMOCK_ROOT}/gtest /usr/src/gtest) + HINTS ${GTEST_ROOT} ${GMOCK_ROOT}/gtest /usr/src/gtest) find_library(GTEST_SHARED_LIB gtest) find_library(GTEST_MAIN_LIB gtest_main) if ((GTEST_SHARED_LIB OR GTEST_SRC_DIR) AND GTEST_INCLUDE_DIR) @@ -147,17 +147,17 @@ function(gnc_gtest_configure) message(STATUS "Checking for GMOCK") find_path(GMOCK_INCLUDE_DIR gmock/gmock.h - PATHS ${GMOCK_ROOT}/include /usr/include) + HINTS ${GMOCK_ROOT}/include /usr/include) unset(GMOCK_SRC_DIR CACHE) find_library(GMOCK_SHARED_LIB gmock) find_library(GMOCK_MAIN_LIB gmock_main) find_path(GMOCK_SRC_DIR src/gmock-all.cc - PATHS ${GMOCK_ROOT} /usr/src/gmock) + HINTS ${GMOCK_ROOT} /usr/src/gmock) if (GMOCK_SRC_DIR) set(GMOCK_MAIN_SRC_DIR "${GMOCK_SRC_DIR}/src") else() find_path(GMOCK_SRC_DIR gmock-all.cc - PATHS ${GMOCK_ROOT} /usr/src/gmock) + HINTS ${GMOCK_ROOT} /usr/src/gmock) if (GMOCK_SRC_DIR) set(GMOCK_MAIN_SRC_DIR "${GMOCK_SRC_DIR}") endif()