From 7fbba030c2da5d13bc159c472b8c2cf4c2af41d7 Mon Sep 17 00:00:00 2001 From: Jeremy Rimpo Date: Wed, 9 Sep 2020 18:11:40 -0500 Subject: [PATCH] Rework gtest location to fix appveyor issues --- cpp.cmake | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/cpp.cmake b/cpp.cmake index 264b9a1..5f2eeda 100644 --- a/cpp.cmake +++ b/cpp.cmake @@ -74,6 +74,13 @@ macro(cpp_pre_target) # this needs to happen before the include() below because they're only used # when creating the target + + if(DEFINED DEPENDENCIES_DIR) + set(gtest_directory ${DEPENDENCIES_DIR}/googletest) + else() + set(gtest_directory ${modorganizer_build_path}/googletest) + endif() + link_directories( ${modorganizer_install_lib_path} ${Boost_LIBRARY_DIRS} @@ -81,7 +88,7 @@ macro(cpp_pre_target) ${ZLIB_ROOT}/lib ${LOOT_PATH} ${LIBBSARCH_ROOT} - ${modorganizer_build_path}/googletest/build/lib + ${gtest_directory}/build/lib ) endmacro() @@ -234,9 +241,15 @@ function(requires_library) add_dependencies(${PROJECT_NAME} cpptoml) elseif(${name} STREQUAL "gtest") - target_include_directories(${PROJECT_NAME} PRIVATE - ${modorganizer_build_path}/googletest/googletest/include - ${modorganizer_build_path}/googletest/googlemock/include) + if(DEFINED DEPENDENCIES_DIR) + set(gtest_directory ${DEPENDENCIES_DIR}/googletest) + else() + set(gtest_directory ${modorganizer_build_path}/googletest) + endif() + target_include_directories(${PROJECT_NAME} PRIVATE + ${gtest_directory}/googletest/include + ${gtest_directory}/googletest/googlemock/include) + target_link_libraries(${PROJECT_NAME} gtest) target_link_libraries(${PROJECT_NAME} gmock) target_link_libraries(${PROJECT_NAME} gtest_main)