|
@@ -94,13 +94,17 @@ macro(__addDef def config)
|
|
|
if(TARGET ${PROJECT_NAME})
|
|
|
#message(STATUS "directly applying defs: ${PROJECT_NAME} with config ${config}: ${def}")
|
|
|
if("${config}" STREQUAL "")
|
|
|
- set_property(TARGET ${PROJECT_NAME} APPEND PROPERTY COMPILE_DEFINITIONS "${def}")
|
|
|
+ set_property(TARGET ${PROJECT_NAME} APPEND PROPERTY COMPILE_DEFINITIONS ${def})
|
|
|
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()
|
|
|
else()
|
|
|
- list(APPEND ${PROJECT_NAME}_defs_${config} ${def})
|
|
|
- #message(STATUS "added definition to cache: ${PROJECT_NAME}_defs_${config}: ${${PROJECT_NAME}_defs_${config}}")
|
|
|
+ if("${config}" STREQUAL "")
|
|
|
+ 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()
|
|
|
endmacro()
|
|
|
|
|
@@ -120,15 +124,8 @@ endmacro()
|
|
|
macro(_process_defs)
|
|
|
if(DEFINED ${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()
|
|
|
- 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()
|
|
|
|
|
|
###############################################################################
|