From d4c73c87335d0d7b5135a674817b0a6af80ba2d0 Mon Sep 17 00:00:00 2001 From: AzaezelX Date: Sat, 10 Jun 2023 19:26:18 -0500 Subject: [PATCH] gtest cmake config convert --- Tools/CMake/modules/module_testing.cmake | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/Tools/CMake/modules/module_testing.cmake b/Tools/CMake/modules/module_testing.cmake index 27adeccbb..34bc12a69 100644 --- a/Tools/CMake/modules/module_testing.cmake +++ b/Tools/CMake/modules/module_testing.cmake @@ -24,15 +24,14 @@ option(TORQUE_TESTING "Enable unit test module" OFF) mark_as_advanced(TORQUE_TESTING) if(TORQUE_TESTING) - + message("Enabling Unit Testing") # Project defines - addDef( "TORQUE_TESTS_ENABLED" ) - addDef( "_VARIADIC_MAX" 10 ) - - # Add source files - addPathRec( "${srcDir}/testing" ) - - # Add include paths - addInclude( "${libDir}/gtest/" ) - + set(TORQUE_COMPILE_DEFINITIONS ${TORQUE_COMPILE_DEFINITIONS} TORQUE_TESTS_ENABLED) + set(TORQUE_COMPILE_DEFINITIONS ${TORQUE_COMPILE_DEFINITIONS} "_VARIADIC_MAX=10") + + file(GLOB_RECURSE TORQUE_TESTS_SOURCES "${CMAKE_SOURCE_DIR}/Engine/source/testing/*.cpp" "${CMAKE_SOURCE_DIR}/Engine/source/testing/*.h" ) + set(TORQUE_SOURCE_FILES ${TORQUE_SOURCE_FILES} ${TORQUE_TESTS_SOURCES}) + + file(GLOB_RECURSE TORQUE_GTESTS_SOURCES "${CMAKE_SOURCE_DIR}/Engine/lib/gtest/*.cpp" "${CMAKE_SOURCE_DIR}/Engine/lib/gtest/*.h" ) + set(TORQUE_SOURCE_FILES ${TORQUE_SOURCE_FILES} ${TORQUE_GTESTS_SOURCES}) endif()