From 3a45a143484160d65f4b9bd551e3b8f6b8332c15 Mon Sep 17 00:00:00 2001 From: Ionut Cava Date: Wed, 15 May 2024 18:41:43 +0100 Subject: [PATCH] A bit of logging for unit testing --- CMakeLists.txt | 2 ++ Source/CMakeLists.txt | 5 ++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3190a60b1..d5985e194 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -74,9 +74,11 @@ if (DIVIDE_STARTUP_TYPE STREQUAL "IN_EDITOR") endif() if (BUILD_TESTING_INTERNAL) + message("Unit testing enabled!") list(APPEND CMAKE_CTEST_ARGUMENTS "--output-on-failure") enable_testing() endif() + add_subdirectory(Source) set_property(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" PROPERTY VS_STARTUP_PROJECT Divide-Framework) diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt index 0818f42c0..f0a4ff838 100644 --- a/Source/CMakeLists.txt +++ b/Source/CMakeLists.txt @@ -175,9 +175,6 @@ if(BUILD_TESTING_INTERNAL) add_dependencies(${APP_EXE_TEST_PLATFORM} ${APP_EXE_DIVIDE}BinGenerated) target_precompile_headers(${APP_EXE_TEST_PLATFORM} REUSE_FROM ${APP_LIB_DIVIDE}) catch_discover_tests( ${APP_EXE_TEST_PLATFORM} WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" ) - if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") - target_compile_options(${APP_EXE_TEST_PLATFORM} PRIVATE /wd4866 /wd4868) - endif() add_executable( ${APP_EXE_TEST_ENGINE} "UnitTests/main.cpp" ${TEST_ENGINE_SOURCE}) target_link_libraries( ${APP_EXE_TEST_ENGINE} PRIVATE ${COMMON_LIBS} PRIVATE Catch2::Catch2 ) @@ -185,7 +182,9 @@ if(BUILD_TESTING_INTERNAL) add_dependencies(${APP_EXE_TEST_ENGINE} ${APP_EXE_DIVIDE}BinGenerated) target_precompile_headers(${APP_EXE_TEST_ENGINE} REUSE_FROM ${APP_LIB_DIVIDE}) catch_discover_tests( ${APP_EXE_TEST_ENGINE} WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" ) + if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") + target_compile_options(${APP_EXE_TEST_PLATFORM} PRIVATE /wd4866 /wd4868) target_compile_options(${APP_EXE_TEST_ENGINE} PRIVATE /wd4866 /wd4868) endif() endif()