From 1c9ec8f2cf259308efd4eea81acc7947a6ce3638 Mon Sep 17 00:00:00 2001 From: Katy Huff Date: Sat, 31 May 2014 19:23:53 -0700 Subject: [PATCH] fixes #12 on @katyhuff's computer. --- cmake/FindCyclus.cmake | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/cmake/FindCyclus.cmake b/cmake/FindCyclus.cmake index 9e6016d..1efb959 100644 --- a/cmake/FindCyclus.cmake +++ b/cmake/FindCyclus.cmake @@ -40,10 +40,16 @@ FIND_PATH(CYCLUS_CORE_TEST_INCLUDE_DIR agent_tests.h /usr/local/cyclus /opt/local/cyclus PATH_SUFFIXES cyclus/include include include/cyclus include/cyclus/tests cyclus/include/tests) -SET( - CYCLUS_CORE_TEST_INCLUDE_DIR ${CYCLUS_CORE_TEST_INCLUDE_DIR} - ${CYCLUS_CORE_TEST_INCLUDE_DIR}/../gtest - ) +# find the directory containing gtest +FIND_PATH(CYCLUS_GTEST_INCLUDE_DIR gtest/gtest.h + HINTS "${CYCLUS_ROOT_DIR}" "${CYCLUS_ROOT_DIR}" + "${CYCLUS_ROOT_DIR}/include" + "${CYCLUS_ROOT_DIR}/include/cyclus" + /usr/local/cyclus /opt/local/cyclus + PATH_SUFFIXES cyclus/include include include/cyclus) + +SET(CYCLUS_CORE_TEST_INCLUDE_DIR ${CYCLUS_CORE_TEST_INCLUDE_DIR} + ${CYCLUS_GTEST_INCLUDE_DIR}) # Add the root dir to the hints SET(CYCLUS_ROOT_DIR "${CYCLUS_CORE_INCLUDE_DIR}/../..")