TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-20 04:34:48 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #731 from LuisAntonRebollo/fix_cmake_testing_module

Browse source 
Fix CMake testing module.
This commit is contained in:
Daniel Buckmaster 2014-07-12 16:06:42 +02:00
parent e09a09005d a030f47178
commit c8153cfd29
2 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Tools/CMake/modules/module_testing.cmake
View file

@ -1,9 +1,15 @@
# Project defines
addDef( "TORQUE_TESTS_ENABLED" )
addDef( "_VARIADIC_MAX" 10 )
option(TORQUE_TESTS_ENABLED "TORQUE_TESTS_ENABLED" OFF)
# Add source files
addPathRec( "${srcDir}/testing" )
if(TORQUE_TESTS_ENABLED)
# Add include paths
addInclude( "${libDir}/gtest/fused-src/" )
# Project defines
addDef( "TORQUE_TESTS_ENABLED" )
addDef( "_VARIADIC_MAX" 10 )
# Add source files
addPathRec( "${srcDir}/testing" )
# Add include paths
addInclude( "${libDir}/gtest/fused-src/" )
endif()

2
Tools/CMake/torque3d.cmake
View file

@ -325,6 +325,8 @@ if(TORQUE_DEDICATED)
addDef(TORQUE_DEDICATED)
endif()
include( "modules/module_testing.cmake" )
###############################################################################
# platform specific things