TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-20 04:34:48 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #800 from LuisAntonRebollo/fix_cmake_warnings

Browse source 
Fix compiler warnings with CMAKE and TORQUE_DISABLE_MEMORY_MANAGER.
This commit is contained in:
Daniel Buckmaster 2014-09-29 14:47:27 +10:00
parent 929f6cf371 b18bcfb709
commit 6aac659bf4
1 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Tools/CMake/torque3d.cmake
View file

@ -339,10 +339,6 @@ if(TORQUE_HYDRA)
include( "modules/module_hydra.cmake" )
endif()
if(TORQUE_DISABLE_MEMORY_MANAGER)
addDef(TORQUE_DISABLE_MEMORY_MANAGER)
endif()
if(TORQUE_DEDICATED)
addDef(TORQUE_DEDICATED)
endif()
@ -456,11 +452,10 @@ finishExecutable()
###############################################################################
###############################################################################
message(STATUS "writing ${projectSrcDir}/torqueConfig.h")
CONFIGURE_FILE("${cmakeDir}/torqueConfig.h.in" "${projectSrcDir}/torqueConfig.h")
# configure the relevant files only once
if(NOT EXISTS "${projectSrcDir}/torqueConfig.h")
message(STATUS "writing ${projectSrcDir}/torqueConfig.h")
CONFIGURE_FILE("${cmakeDir}/torqueConfig.h.in" "${projectSrcDir}/torqueConfig.h")
endif()
if(NOT EXISTS "${projectSrcDir}/torque.ico")
CONFIGURE_FILE("${cmakeDir}/torque.ico" "${projectSrcDir}/torque.ico" COPYONLY)
endif()