소스 검색

Fix CMake testing module.

LuisAntonRebollo 11 년 전
부모
커밋
a030f47178
2개의 변경된 파일15개의 추가작업 그리고 7개의 파일을 삭제
  1. 13 7
      Tools/CMake/modules/module_testing.cmake
  2. 2 0
      Tools/CMake/torque3d.cmake

+ 13 - 7
Tools/CMake/modules/module_testing.cmake

@@ -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 - 0
Tools/CMake/torque3d.cmake

@@ -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