TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-13 15:44:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

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
commit c8153cfd29
2 changed files with 15 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

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

2
Tools/CMake/torque3d.cmake
View file

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