From 8e9b7d8919dec7295d75cc46ce261951dd6cab16 Mon Sep 17 00:00:00 2001 From: Michael Carroll Date: Tue, 31 May 2022 10:02:28 -0500 Subject: [PATCH] Update testing CMake for new GoogleTest Signed-off-by: Michael Carroll --- test/CMakeLists.txt | 16 ++++++++++------ test/integration/CMakeLists.txt | 1 + 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 307dcf48f..b2694924b 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -1,17 +1,21 @@ -include_directories( - ${PROJECT_SOURCE_DIR}/test/gtest/include - ${PROJECT_SOURCE_DIR}/test/gtest - ${PROJECT_SOURCE_DIR}/test -) - # Build gtest add_library(gtest STATIC gtest/src/gtest-all.cc) add_library(gtest_main STATIC gtest/src/gtest_main.cc) +target_include_directories(gtest + SYSTEM PUBLIC + ${PROJECT_SOURCE_DIR}/test/gtest/include + ${PROJECT_SOURCE_DIR}/test/gtest +) target_link_libraries(gtest_main gtest) +set_property(TARGET gtest_main PROPERTY CXX_STANDARD ${c++standard}) +set_property(TARGET gtest PROPERTY CXX_STANDARD ${c++standard}) set(GTEST_LIBRARY "${PROJECT_BINARY_DIR}/test/libgtest.a") set(GTEST_MAIN_LIBRARY "${PROJECT_BINARY_DIR}/test/libgtest_main.a") +execute_process(COMMAND cmake -E remove_directory ${CMAKE_BINARY_DIR}/test_results) +execute_process(COMMAND cmake -E make_directory ${CMAKE_BINARY_DIR}/test_results) + add_subdirectory(integration) add_subdirectory(performance) add_subdirectory(regression) diff --git a/test/integration/CMakeLists.txt b/test/integration/CMakeLists.txt index 696247eeb..7ce88421d 100644 --- a/test/integration/CMakeLists.txt +++ b/test/integration/CMakeLists.txt @@ -9,6 +9,7 @@ ign_build_tests( TYPE INTEGRATION SOURCES ${tests} LIB_DEPS ignition-common${IGN_COMMON_VER}-testing + INCLUDE_DIRS ${PROJECT_SOURCE_DIR}/test ) if(TARGET INTEGRATION_plugin)