From d1070210c21ecb6ee7b0928097f83eab1906b08b Mon Sep 17 00:00:00 2001
From: Daniel Buckmaster <dan.buckmaster@gmail.com>
Date: Sat, 12 Jul 2014 00:00:21 +0200
Subject: [PATCH] Fixed tool support.

---
 Tools/CMake/modules/module_testing.cmake   |  9 ++++++
 Tools/projectGenerator/libs/libgtest.conf  | 34 ----------------------
 Tools/projectGenerator/modules/testing.inc |  1 -
 3 files changed, 9 insertions(+), 35 deletions(-)
 create mode 100644 Tools/CMake/modules/module_testing.cmake
 delete mode 100644 Tools/projectGenerator/libs/libgtest.conf

diff --git a/Tools/CMake/modules/module_testing.cmake b/Tools/CMake/modules/module_testing.cmake
new file mode 100644
index 000000000..5b2fedbd0
--- /dev/null
+++ b/Tools/CMake/modules/module_testing.cmake
@@ -0,0 +1,9 @@
+# Project defines
+addDef( "TORQUE_TESTS_ENABLED" )
+addDef( "_VARIADIC_MAX" 10 )
+
+# Add source files
+addPathRec( "${srcDir}/testing" )
+
+# Add include paths
+addInclude( "${libDir}/gtest/fused-src/" )
diff --git a/Tools/projectGenerator/libs/libgtest.conf b/Tools/projectGenerator/libs/libgtest.conf
deleted file mode 100644
index 3d66b9f4a..000000000
--- a/Tools/projectGenerator/libs/libgtest.conf
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-//-----------------------------------------------------------------------------
-// Copyright (c) 2014 GarageGames, LLC
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to
-// deal in the Software without restriction, including without limitation the
-// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-// sell copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-// IN THE SOFTWARE.
-//-----------------------------------------------------------------------------
-
-beginLibConfig( 'libgtest', '{F2C0209B-1B90-4F73-816A-A0920FF8B107}' );
-
-   // Source
-   addSrcDir( T3D_Generator::getLibSrcDir() . 'gtest/fused-src/gtest', true );
-
-   // Additional includes
-   addLibIncludePath( 'gtest/fused-src/' );
-
-endLibConfig();
-
-?>
diff --git a/Tools/projectGenerator/modules/testing.inc b/Tools/projectGenerator/modules/testing.inc
index cf9f21c26..384ab14e8 100644
--- a/Tools/projectGenerator/modules/testing.inc
+++ b/Tools/projectGenerator/modules/testing.inc
@@ -27,7 +27,6 @@ beginModule( 'testing' );
    addProjectDefine( '_VARIADIC_MAX', 10 );
    addSrcDir(getEngineSrcDir() . 'testing', true);
 
-   includeLib( 'libgtest' );
    addLibIncludePath( 'gtest/fused-src/' );
 
 endModule();