diff options
| -rw-r--r-- | CMakeLists.txt | 6 | ||||
| -rw-r--r-- | cmake/Modules/GrPackage.cmake | 4 | ||||
| -rw-r--r-- | cmake/Modules/GrPython.cmake | 2 | ||||
| -rw-r--r-- | gnuradio-core/CMakeLists.txt | 15 | ||||
| -rw-r--r-- | gr-atsc/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | gr-audio/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | gr-comedi/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | gr-digital/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | gr-noaa/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | gr-pager/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | gr-qtgui/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | gr-trellis/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | gr-uhd/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | gr-video-sdl/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | gr-vocoder/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | gruel/CMakeLists.txt | 2 |
16 files changed, 21 insertions, 30 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 21c98d733d..eb520bf56c 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 7647324a07..2fc9fc08af 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/cmake/Modules/GrPython.cmake b/cmake/Modules/GrPython.cmake index 676a98c41e..8cffd7a010 100644 --- a/cmake/Modules/GrPython.cmake +++ b/cmake/Modules/GrPython.cmake @@ -89,7 +89,7 @@ ENDMACRO(GR_PYTHON_CHECK_MODULE) ######################################################################## EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c " from distutils import sysconfig -print sysconfig.get_python_lib(prefix='') +print sysconfig.get_python_lib(plat_specific=True, prefix='') " OUTPUT_VARIABLE GR_PYTHON_DIR OUTPUT_STRIP_TRAILING_WHITESPACE ) FILE(TO_CMAKE_PATH ${GR_PYTHON_DIR} GR_PYTHON_DIR) diff --git a/gnuradio-core/CMakeLists.txt b/gnuradio-core/CMakeLists.txt index 102e64274b..1c133efb93 100644 --- a/gnuradio-core/CMakeLists.txt +++ b/gnuradio-core/CMakeLists.txt @@ -79,7 +79,7 @@ IF(ENABLE_GR_CORE) # Setup CPack components ######################################################################## INCLUDE(GrPackage) -CPACK_SET(CPACK_COMPONENT_GROUP_CORE_DESCRIPTION "The GNU Radio Core Library") +CPACK_SET(CPACK_COMPONENT_GROUP_CORE_DESCRIPTION "GNU Radio Core Library") CPACK_COMPONENT("core_runtime" GROUP "Core" @@ -131,19 +131,6 @@ ENDIF(ENABLE_PYTHON) # Create Pkg Config File ######################################################################## FILE(TO_NATIVE_PATH "\${prefix}/${GR_INCLUDE_DIR}/gnuradio" includedir) #different from other gr modules -FILE(TO_NATIVE_PATH "${CMAKE_INSTALL_PREFIX}/${GR_DATA_DIR}/guile/site" guile_load_path) #screw this... - -FOREACH(boost_include ${Boost_INCLUDE_DIRS}) - SET(BOOST_CXXFLAGS "-I${boost_include} ${BOOST_CXXFLAGS}") -ENDFOREACH(boost_include) - -FOREACH(boost_libdir ${Boost_LIBRARY_DIRS}) - SET(BOOST_LDFLAGS "-L${boost_libdir} ${BOOST_LDFLAGS}") -ENDFOREACH(boost_libdir) - -FOREACH(boost_ldflag ${Boost_LIBRARIES}) - SET(BOOST_LDFLAGS "${boost_ldflag} ${BOOST_LDFLAGS}") -ENDFOREACH(boost_ldflag) CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/gnuradio-core.pc.in diff --git a/gr-atsc/CMakeLists.txt b/gr-atsc/CMakeLists.txt index 99ba390dde..ab5bf82310 100644 --- a/gr-atsc/CMakeLists.txt +++ b/gr-atsc/CMakeLists.txt @@ -47,7 +47,7 @@ IF(ENABLE_GR_ATSC) # Setup CPack components ######################################################################## INCLUDE(GrPackage) -CPACK_SET(CPACK_COMPONENT_GROUP_ATSC_DESCRIPTION "The GNU Radio ATSC Blocks") +CPACK_SET(CPACK_COMPONENT_GROUP_ATSC_DESCRIPTION "GNU Radio ATSC Blocks") CPACK_COMPONENT("atsc_runtime" GROUP "ATSC" diff --git a/gr-audio/CMakeLists.txt b/gr-audio/CMakeLists.txt index d44397c020..c78a9cc381 100644 --- a/gr-audio/CMakeLists.txt +++ b/gr-audio/CMakeLists.txt @@ -42,7 +42,7 @@ IF(ENABLE_GR_AUDIO) # Setup CPack components ######################################################################## INCLUDE(GrPackage) -CPACK_SET(CPACK_COMPONENT_GROUP_AUDIO_DESCRIPTION "The GNU Radio Audio Blocks") +CPACK_SET(CPACK_COMPONENT_GROUP_AUDIO_DESCRIPTION "GNU Radio Audio Blocks") CPACK_COMPONENT("audio_runtime" GROUP "Audio" diff --git a/gr-comedi/CMakeLists.txt b/gr-comedi/CMakeLists.txt index 143aa0e2e9..16a930b49b 100644 --- a/gr-comedi/CMakeLists.txt +++ b/gr-comedi/CMakeLists.txt @@ -52,7 +52,7 @@ IF(ENABLE_GR_COMEDI) # Setup CPack components ######################################################################## INCLUDE(GrPackage) -CPACK_SET(CPACK_COMPONENT_GROUP_COMEDI_DESCRIPTION "The GNU Radio Comedi Blocks") +CPACK_SET(CPACK_COMPONENT_GROUP_COMEDI_DESCRIPTION "GNU Radio Comedi Blocks") CPACK_COMPONENT("comedi_runtime" GROUP "Comedi" diff --git a/gr-digital/CMakeLists.txt b/gr-digital/CMakeLists.txt index e88c1087b0..cc00da69a9 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 "GNU Radio Digital Blocks") CPACK_COMPONENT("digital_runtime" GROUP "Digital" diff --git a/gr-noaa/CMakeLists.txt b/gr-noaa/CMakeLists.txt index 7a6ad4b5e0..b854a5e189 100644 --- a/gr-noaa/CMakeLists.txt +++ b/gr-noaa/CMakeLists.txt @@ -44,7 +44,7 @@ IF(ENABLE_GR_NOAA) # Setup CPack components ######################################################################## INCLUDE(GrPackage) -CPACK_SET(CPACK_COMPONENT_GROUP_NOAA_DESCRIPTION "The GNU Radio NOAA Blocks") +CPACK_SET(CPACK_COMPONENT_GROUP_NOAA_DESCRIPTION "GNU Radio NOAA Blocks") CPACK_COMPONENT("noaa_runtime" GROUP "NOAA" diff --git a/gr-pager/CMakeLists.txt b/gr-pager/CMakeLists.txt index b138acc381..ac02a28c9c 100644 --- a/gr-pager/CMakeLists.txt +++ b/gr-pager/CMakeLists.txt @@ -44,7 +44,7 @@ IF(ENABLE_GR_PAGER) # Setup CPack components ######################################################################## INCLUDE(GrPackage) -CPACK_SET(CPACK_COMPONENT_GROUP_PAGER_DESCRIPTION "The GNU Radio Pager Blocks") +CPACK_SET(CPACK_COMPONENT_GROUP_PAGER_DESCRIPTION "GNU Radio Pager Blocks") CPACK_COMPONENT("pager_runtime" GROUP "Pager" diff --git a/gr-qtgui/CMakeLists.txt b/gr-qtgui/CMakeLists.txt index 5252af36b6..280d856af2 100644 --- a/gr-qtgui/CMakeLists.txt +++ b/gr-qtgui/CMakeLists.txt @@ -59,7 +59,7 @@ IF(ENABLE_GR_QTGUI) # Setup CPack components ######################################################################## INCLUDE(GrPackage) -CPACK_SET(CPACK_COMPONENT_GROUP_QTGUI_DESCRIPTION "The GNU Radio QtGUI Blocks") +CPACK_SET(CPACK_COMPONENT_GROUP_QTGUI_DESCRIPTION "GNU Radio QtGUI Blocks") CPACK_COMPONENT("qtgui_runtime" GROUP "QtGUI" diff --git a/gr-trellis/CMakeLists.txt b/gr-trellis/CMakeLists.txt index d432365da2..11b547d70d 100644 --- a/gr-trellis/CMakeLists.txt +++ b/gr-trellis/CMakeLists.txt @@ -46,7 +46,7 @@ IF(ENABLE_GR_TRELLIS) # Setup CPack components ######################################################################## INCLUDE(GrPackage) -CPACK_SET(CPACK_COMPONENT_GROUP_TRELLIS_DESCRIPTION "The GNU Radio Trellis Blocks") +CPACK_SET(CPACK_COMPONENT_GROUP_TRELLIS_DESCRIPTION "GNU Radio Trellis Blocks") CPACK_COMPONENT("trellis_docs" GROUP "Trellis" diff --git a/gr-uhd/CMakeLists.txt b/gr-uhd/CMakeLists.txt index 8a5f4e8165..2e7e26ab0a 100644 --- a/gr-uhd/CMakeLists.txt +++ b/gr-uhd/CMakeLists.txt @@ -48,7 +48,7 @@ IF(ENABLE_GR_UHD) # Setup CPack components ######################################################################## INCLUDE(GrPackage) -CPACK_SET(CPACK_COMPONENT_GROUP_UHD_DESCRIPTION "The GNU Radio UHD Blocks") +CPACK_SET(CPACK_COMPONENT_GROUP_UHD_DESCRIPTION "GNU Radio UHD Blocks") CPACK_COMPONENT("uhd_runtime" GROUP "UHD" diff --git a/gr-video-sdl/CMakeLists.txt b/gr-video-sdl/CMakeLists.txt index a5d4f1b49e..4dc9874ba2 100644 --- a/gr-video-sdl/CMakeLists.txt +++ b/gr-video-sdl/CMakeLists.txt @@ -47,7 +47,7 @@ IF(ENABLE_GR_VIDEO_SDL) # Setup CPack components ######################################################################## INCLUDE(GrPackage) -CPACK_SET(CPACK_COMPONENT_GROUP_VIDEO_SDL_DESCRIPTION "The GNU Radio Video SDL Blocks") +CPACK_SET(CPACK_COMPONENT_GROUP_VIDEO_SDL_DESCRIPTION "GNU Radio Video SDL Blocks") CPACK_COMPONENT("video_sdl_runtime" GROUP "Video SDL" diff --git a/gr-vocoder/CMakeLists.txt b/gr-vocoder/CMakeLists.txt index 5f3801f0d5..16ee6bbf0f 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 "GNU Radio Vocoder Blocks") CPACK_COMPONENT("vocoder_runtime" GROUP "Vocoder" diff --git a/gruel/CMakeLists.txt b/gruel/CMakeLists.txt index 04be4486ea..933e74b2f3 100644 --- a/gruel/CMakeLists.txt +++ b/gruel/CMakeLists.txt @@ -49,7 +49,7 @@ IF(ENABLE_GRUEL) # Setup CPack components ######################################################################## INCLUDE(GrPackage) -CPACK_SET(CPACK_COMPONENT_GROUP_GRUEL_DESCRIPTION "The GNU Radio Utility Etcetera Library") +CPACK_SET(CPACK_COMPONENT_GROUP_GRUEL_DESCRIPTION "GNU Radio Utility Etcetera Library") CPACK_COMPONENT("gruel_runtime" GROUP "Gruel" |