diff options
| -rw-r--r-- | CMakeLists.txt | 6 | ||||
| -rw-r--r-- | cmake/Modules/GrPackage.cmake | 4 | ||||
| -rw-r--r-- | gr-digital/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | gr-vocoder/CMakeLists.txt | 2 |
4 files changed, 9 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 21c98d733..eb520bf56 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -153,6 +153,8 @@ SET(VOLK_INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR}/volk/include ) +IF(ENABLE_VOLK) + INCLUDE(GrPackage) CPACK_SET(CPACK_COMPONENT_GROUP_VOLK_DESCRIPTION "Vector optimized library of kernels") @@ -168,8 +170,8 @@ CPACK_COMPONENT("volk_devel" DESCRIPTION "C++ headers, package config, import libraries" ) -IF(ENABLE_VOLK) - ADD_SUBDIRECTORY(volk) + +ADD_SUBDIRECTORY(volk) ENDIF(ENABLE_VOLK) ######################################################################## 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) diff --git a/gr-digital/CMakeLists.txt b/gr-digital/CMakeLists.txt index e88c1087b..38fcdf158 100644 --- a/gr-digital/CMakeLists.txt +++ b/gr-digital/CMakeLists.txt @@ -48,7 +48,7 @@ IF(ENABLE_GR_DIGITAL) # Setup CPack components ######################################################################## INCLUDE(GrPackage) -CPACK_SET(CPACK_COMPONENT_GROUP_TRELLIS_DESCRIPTION "The GNU Radio Digital Blocks") +CPACK_SET(CPACK_COMPONENT_GROUP_DIGITAL_DESCRIPTION "The GNU Radio Digital Blocks") CPACK_COMPONENT("digital_runtime" GROUP "Digital" diff --git a/gr-vocoder/CMakeLists.txt b/gr-vocoder/CMakeLists.txt index 5f3801f0d..0c10b6802 100644 --- a/gr-vocoder/CMakeLists.txt +++ b/gr-vocoder/CMakeLists.txt @@ -44,7 +44,7 @@ IF(ENABLE_GR_VOCODER) # Setup CPack components ######################################################################## INCLUDE(GrPackage) -CPACK_SET(CPACK_COMPONENT_GROUP_vocoder_DESCRIPTION "The GNU Radio Vocoder Blocks") +CPACK_SET(CPACK_COMPONENT_GROUP_VOCODER_DESCRIPTION "The GNU Radio Vocoder Blocks") CPACK_COMPONENT("vocoder_runtime" GROUP "Vocoder" |