From 79dffb18778a734ed911ef850671c8e41e349428 Mon Sep 17 00:00:00 2001 From: AzaezelX Date: Thu, 15 Jun 2023 19:54:38 -0500 Subject: [PATCH] get gtest partly hooked back up. todo: engine/source directories only included when TORQUE_TESTING is on --- Tools/CMake/modules/module_testing.cmake | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/Tools/CMake/modules/module_testing.cmake b/Tools/CMake/modules/module_testing.cmake index 34bc12a69..3226a515a 100644 --- a/Tools/CMake/modules/module_testing.cmake +++ b/Tools/CMake/modules/module_testing.cmake @@ -28,10 +28,17 @@ if(TORQUE_TESTING) # Project defines 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}) + + # Add source files + file(GLOB_RECURSE TORQUE_TESTING_SOURCES "testing/*.cpp" "testing/*.h") + set(TORQUE_SOURCE_FILES ${TORQUE_SOURCE_FILES} ${TORQUE_TESTING_SOURCES}) +project(gtest) + # Add include paths + set(LIBOGG_FILES ${LIBOGG_SOURCE_FILES} ${LIBOGG_HEADER_FILES}) + set_target_properties(libogg PROPERTIES LINKER_LANGUAGE CXX) + file(GLOB_RECURSE TORQUE_GTEST_SOURCES "${CMAKE_SOURCE_DIR}/Engine/lib/gtest/*.c*" "${CMAKE_SOURCE_DIR}/Engine/lib/gtest/*.h") + add_library(gtest ${TORQUE_GTEST_SOURCES}) + set_target_properties(gtest PROPERTIES LINKER_LANGUAGE CXX) + target_include_directories(gtest PUBLIC "${CMAKE_SOURCE_DIR}/Engine/lib/gtest/") + set(TORQUE_LINK_LIBRARIES ${TORQUE_LINK_LIBRARIES} gtest) endif()