From a030f47178cdf3e5b0788de5f709578ae2836917 Mon Sep 17 00:00:00 2001
From: LuisAntonRebollo <souga_el_diablo_negro@hotmail.com>
Date: Sat, 12 Jul 2014 13:44:48 +0200
Subject: [PATCH] Fix CMake testing module.

---
 Tools/CMake/modules/module_testing.cmake | 20 +++++++++++++-------
 Tools/CMake/torque3d.cmake               |  2 ++
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/Tools/CMake/modules/module_testing.cmake b/Tools/CMake/modules/module_testing.cmake
index 5b2fedbd0..35c2f7a3a 100644
--- a/Tools/CMake/modules/module_testing.cmake
+++ b/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()
\ No newline at end of file
diff --git a/Tools/CMake/torque3d.cmake b/Tools/CMake/torque3d.cmake
index c17009c1d..61d9fea54 100644
--- a/Tools/CMake/torque3d.cmake
+++ b/Tools/CMake/torque3d.cmake
@@ -325,6 +325,8 @@ if(TORQUE_DEDICATED)
     addDef(TORQUE_DEDICATED)
 endif()
 
+include( "modules/module_testing.cmake" )
+
 
 ###############################################################################
 # platform specific things