kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'cpack-ifw-list-variable' 

9e505285 CPackIFW: Using cpack_append_list_variable_set_command
cd1415b5 CPackComponents: add cpack_append_list_variable_set_command
This commit is contained in:
Brad King 2016-07-06 09:35:06 -04:00 committed by CMake Topic Stage
parent 7d3fe197f8 9e505285e3
commit 06af626ef2
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Modules/CPackComponent.cmake
View File

@ -360,6 +360,20 @@ macro(cpack_append_string_variable_set_command var strvar)
endif () endif ()
endmacro() endmacro()
# Macro that appends a SET command for the given list variable name (var)
# to the macro named strvar, but only if the variable named "var"
# has been defined. It's like add variable, but wrap each item to quotes.
# The string will eventually be appended to a CPack configuration file.
macro(cpack_append_list_variable_set_command var strvar)
if (DEFINED ${var})
string(APPEND ${strvar} "set(${var}")
foreach(_val IN LISTS ${var})
string(APPEND ${strvar} "\n \"${_val}\"")
endforeach()
string(APPEND ${strvar} ")\n")
endif ()
endmacro()
# Macro that appends a SET command for the given variable name (var) # Macro that appends a SET command for the given variable name (var)
# to the macro named strvar, but only if the variable named "var" # to the macro named strvar, but only if the variable named "var"
# has been set to true. The string will eventually be # has been set to true. The string will eventually be

4
Modules/CPackIFW.cmake
View File

@ -571,7 +571,7 @@ macro(cpack_ifw_configure_component compname)
endforeach() endforeach()
foreach(_IFW_ARG_NAME ${_IFW_MULTI_ARGS}) foreach(_IFW_ARG_NAME ${_IFW_MULTI_ARGS})
cpack_append_variable_set_command( cpack_append_list_variable_set_command(
CPACK_IFW_COMPONENT_${_CPACK_IFWCOMP_UNAME}_${_IFW_ARG_NAME} CPACK_IFW_COMPONENT_${_CPACK_IFWCOMP_UNAME}_${_IFW_ARG_NAME}
_CPACK_IFWCOMP_STR) _CPACK_IFWCOMP_STR)
endforeach() endforeach()
@ -604,7 +604,7 @@ macro(cpack_ifw_configure_component_group grpname)
endforeach() endforeach()
foreach(_IFW_ARG_NAME ${_IFW_MULTI_ARGS}) foreach(_IFW_ARG_NAME ${_IFW_MULTI_ARGS})
cpack_append_variable_set_command( cpack_append_list_variable_set_command(
CPACK_IFW_COMPONENT_GROUP_${_CPACK_IFWGRP_UNAME}_${_IFW_ARG_NAME} CPACK_IFW_COMPONENT_GROUP_${_CPACK_IFWGRP_UNAME}_${_IFW_ARG_NAME}
_CPACK_IFWGRP_STR) _CPACK_IFWGRP_STR)
endforeach() endforeach()