diff options
| author | Josh Blum | 2011-07-29 18:22:26 -0700 |
|---|---|---|
| committer | Josh Blum | 2011-07-29 18:24:13 -0700 |
| commit | 609a0cbd99a04824e4e3ad9ca558102146bb9011 (patch) | |
| tree | 8f971994f6ee0e376423a66c6512adb7cce92daf /cmake/Modules/GrPackage.cmake | |
| parent | 8c824bf2e3e6758aff05ee4b5f4d3f106a13c672 (diff) | |
| download | gnuradio-609a0cbd99a04824e4e3ad9ca558102146bb9011.tar.gz gnuradio-609a0cbd99a04824e4e3ad9ca558102146bb9011.tar.bz2 gnuradio-609a0cbd99a04824e4e3ad9ca558102146bb9011.zip | |
cmake: tweaks + fixes for components/packaging
Diffstat (limited to 'cmake/Modules/GrPackage.cmake')
| -rw-r--r-- | cmake/Modules/GrPackage.cmake | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cmake/Modules/GrPackage.cmake b/cmake/Modules/GrPackage.cmake index 7647324a0..2fc9fc08a 100644 --- a/cmake/Modules/GrPackage.cmake +++ b/cmake/Modules/GrPackage.cmake @@ -46,6 +46,7 @@ ENDIF() FUNCTION(CPACK_SET var) SET(${var} ${ARGN} CACHE INTERNAL "") LIST(APPEND _cpack_vars ${var}) + LIST(REMOVE_DUPLICATES _cpack_vars) SET(_cpack_vars ${_cpack_vars} CACHE INTERNAL "") ENDFUNCTION(CPACK_SET) @@ -76,9 +77,10 @@ FUNCTION(CPACK_COMPONENT name) SET(_options GROUP DISPLAY_NAME DESCRIPTION DEPENDS) CMAKE_PARSE_ARGUMENTS(CPACK_COMPONENT "" "${_options}" "" ${ARGN}) + STRING(TOUPPER "${name}" name_upper) FOREACH(_option ${_options}) IF(CPACK_COMPONENT_${_option}) - CPACK_SET(CPACK_COMPONENT_${name}_${_option} "${CPACK_COMPONENT_${_option}}") + CPACK_SET(CPACK_COMPONENT_${name_upper}_${_option} "${CPACK_COMPONENT_${_option}}") ENDIF() ENDFOREACH(_option) |