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

Fixed tool support.

Browse source
This commit is contained in:
Daniel Buckmaster 2014-07-12 00:00:21 +02:00
parent 2248c90d52
commit d1070210c2
3 changed files with 9 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Tools/CMake/modules/module_testing.cmake Normal file
View file

@ -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/" )

34
Tools/projectGenerator/libs/libgtest.conf
View file

@ -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();
?>

1
Tools/projectGenerator/modules/testing.inc
View file

@ -27,7 +27,6 @@ beginModule( 'testing' );
addProjectDefine( '_VARIADIC_MAX', 10 ); addProjectDefine( '_VARIADIC_MAX', 10 );
addSrcDir(getEngineSrcDir() . 'testing', true); addSrcDir(getEngineSrcDir() . 'testing', true);
includeLib( 'libgtest' );
addLibIncludePath( 'gtest/fused-src/' ); addLibIncludePath( 'gtest/fused-src/' );
endModule(); endModule();