From b18bcfb709ff23d2a581e74e11178f55af02ca5e Mon Sep 17 00:00:00 2001 From: LuisAntonRebollo Date: Sun, 28 Sep 2014 20:27:29 +0200 Subject: [PATCH] Fix compiler warnings with CMAKE and TORQUE_DISABLE_MEMORY_MANAGER. --- Tools/CMake/torque3d.cmake | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/Tools/CMake/torque3d.cmake b/Tools/CMake/torque3d.cmake index 7f4ead92d..2fb9b3191 100644 --- a/Tools/CMake/torque3d.cmake +++ b/Tools/CMake/torque3d.cmake @@ -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()