Fix compiler warnings with CMAKE and TORQUE_DISABLE_MEMORY_MANAGER.

This commit is contained in:
LuisAntonRebollo 2014-09-28 20:27:29 +02:00
parent 929f6cf371
commit b18bcfb709

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()