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

Fix CMP0043 cmake warning when using cmake 3.0.2

Browse source 
COMPILE_DEFINITIONS_CONFIG has been deprecated, use generator expressions
with plain COMPILE_DEFINITIONS instead (available since 2.8.10)
This commit is contained in:
Ben Payne 2014-12-02 18:16:47 -05:00
parent 5d5303cf6d
commit 58f07aecb4
2 changed files with 11 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Tools/CMake/basics.cmake
View file

@ -94,13 +94,17 @@ macro(__addDef def config)
if(TARGET ${PROJECT_NAME}) if(TARGET ${PROJECT_NAME})
#message(STATUS "directly applying defs: ${PROJECT_NAME} with config ${config}: ${def}") #message(STATUS "directly applying defs: ${PROJECT_NAME} with config ${config}: ${def}")
if("${config}" STREQUAL "") if("${config}" STREQUAL "")
set_property(TARGET ${PROJECT_NAME} APPEND PROPERTY COMPILE_DEFINITIONS "${def}") set_property(TARGET ${PROJECT_NAME} APPEND PROPERTY COMPILE_DEFINITIONS ${def})
else() else()
set_property(TARGET ${PROJECT_NAME} APPEND PROPERTY COMPILE_DEFINITIONS_${config} "${def}") set_property(TARGET ${PROJECT_NAME} APPEND PROPERTY COMPILE_DEFINITIONS $<$<CONFIG:${config}>:${def}>)
endif() endif()
else() else()
list(APPEND ${PROJECT_NAME}_defs_${config} ${def}) if("${config}" STREQUAL "")
#message(STATUS "added definition to cache: ${PROJECT_NAME}_defs_${config}: ${${PROJECT_NAME}_defs_${config}}") list(APPEND ${PROJECT_NAME}_defs_ ${def})
else()
list(APPEND ${PROJECT_NAME}_defs_ $<$<CONFIG:${config}>:${def}>)
endif()
#message(STATUS "added definition to cache: ${PROJECT_NAME}_defs_: ${${PROJECT_NAME}_defs_}")
endif() endif()
endmacro() endmacro()
@ -120,15 +124,8 @@ endmacro()
macro(_process_defs) macro(_process_defs)
if(DEFINED ${PROJECT_NAME}_defs_) if(DEFINED ${PROJECT_NAME}_defs_)
set_property(TARGET ${PROJECT_NAME} APPEND PROPERTY COMPILE_DEFINITIONS "${${PROJECT_NAME}_defs_}") set_property(TARGET ${PROJECT_NAME} APPEND PROPERTY COMPILE_DEFINITIONS "${${PROJECT_NAME}_defs_}")
#message(STATUS "applying defs to project ${PROJECT_NAME} on all configs: ${${PROJECT_NAME}_defs_}") #message(STATUS "applying defs to project ${PROJECT_NAME}: ${${PROJECT_NAME}_defs_}")
endif() endif()
foreach(def_config ${CMAKE_CONFIGURATION_TYPES})
string(TOUPPER "${def_config}" def_config)
if(DEFINED ${PROJECT_NAME}_defs_${def_config})
set_property(TARGET ${PROJECT_NAME} APPEND PROPERTY COMPILE_DEFINITIONS_${def_config} "${${PROJECT_NAME}_defs_${def_config}}")
#message(STATUS "applying defs to project ${PROJECT_NAME} on config ${def_config}: ${${PROJECT_NAME}_defs_${def_config}}")
endif()
endforeach()
endmacro() endmacro()
############################################################################### ###############################################################################

4
Tools/CMake/torque3d.cmake
View file

@ -534,8 +534,8 @@ endif()
############################################################################### ###############################################################################
# Always enabled Definitions # Always enabled Definitions
############################################################################### ###############################################################################
addDef(TORQUE_DEBUG DEBUG) addDef(TORQUE_DEBUG Debug)
addDef(TORQUE_ENABLE_ASSERTS "DEBUG;RelWithDebInfo") addDef(TORQUE_ENABLE_ASSERTS "Debug;RelWithDebInfo")
addDef(TORQUE_DEBUG_GFX_MODE "RelWithDebInfo") addDef(TORQUE_DEBUG_GFX_MODE "RelWithDebInfo")
addDef(TORQUE_SHADERGEN) addDef(TORQUE_SHADERGEN)
addDef(INITGUID) addDef(INITGUID)