diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2016-08-03 13:47:27 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2016-08-03 13:47:27 -0700 |
| commit | c7692c32cd91c0e98672ce0e997d35f9d3461dd3 (patch) | |
| tree | 692a649a886250bf06dc56a5fabe73e4492a1efa /grc | |
| parent | 77f902e1a7d731805cfcd1a15d22d149898709b0 (diff) | |
cmake: nuke cpack from existence
CPack is not used, unmaintaned, and broken.
This does not eliminate any MSVC build functionality.
Diffstat (limited to 'grc')
| -rw-r--r-- | grc/CMakeLists.txt | 24 | ||||
| -rw-r--r-- | grc/blocks/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | grc/core/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | grc/core/generator/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | grc/core/utils/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | grc/gui/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | grc/scripts/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | grc/scripts/freedesktop/CMakeLists.txt | 3 |
8 files changed, 1 insertions, 34 deletions
diff --git a/grc/CMakeLists.txt b/grc/CMakeLists.txt index 4c782a7f7d..eed5202657 100644 --- a/grc/CMakeLists.txt +++ b/grc/CMakeLists.txt @@ -54,16 +54,6 @@ GR_REGISTER_COMPONENT("gnuradio-companion" ENABLE_GRC if(ENABLE_GRC) ######################################################################## -# Setup CPack components -######################################################################## -include(GrPackage) -CPACK_COMPONENT("grc" - DISPLAY_NAME "GNU Radio Companion" - DESCRIPTION "Graphical flow graph designer" - DEPENDS "runtime_python" -) - -######################################################################## # Create and install the grc conf file ######################################################################## file(TO_NATIVE_PATH ${CMAKE_INSTALL_PREFIX}/${GRC_BLOCKS_DIR} blocksdir) @@ -93,7 +83,6 @@ configure_file( install( FILES ${CMAKE_CURRENT_BINARY_DIR}/grc.conf DESTINATION ${GR_PREFSDIR} - COMPONENT "grc" ) file(GLOB py_files "*.py") @@ -101,7 +90,6 @@ file(GLOB py_files "*.py") GR_PYTHON_INSTALL( FILES ${py_files} DESTINATION ${GR_PYTHON_DIR}/gnuradio/grc - COMPONENT "grc" ) ######################################################################## @@ -118,18 +106,6 @@ string(REPLACE "\\" "\\\\" GRC_BLOCKS_PATH ${GRC_BLOCKS_PATH}) file(TO_NATIVE_PATH ${GR_PYTHON_DIR} GR_PYTHON_POSTFIX) string(REPLACE "\\" "\\\\" GR_PYTHON_POSTFIX ${GR_PYTHON_POSTFIX}) -CPACK_SET(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "${CPACK_NSIS_EXTRA_INSTALL_COMMANDS} - #!include \\\"winmessages.nsh\\\" - WriteRegStr HKLM ${HLKM_ENV} \\\"GRC_BLOCKS_PATH\\\" \\\"$INSTDIR\\\\${GRC_BLOCKS_PATH}\\\" - SendMessage \\\${HWND_BROADCAST} \\\${WM_WININICHANGE} 0 \\\"STR:Environment\\\" /TIMEOUT=5000 -") - -CPACK_SET(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS "${CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS} - #!include \\\"winmessages.nsh\\\" - DeleteRegValue HKLM ${HLKM_ENV} \\\"GRC_BLOCKS_PATH\\\" - SendMessage \\\${HWND_BROADCAST} \\\${WM_WININICHANGE} 0 \\\"STR:Environment\\\" /TIMEOUT=5000 -") - endif(WIN32) ######################################################################## diff --git a/grc/blocks/CMakeLists.txt b/grc/blocks/CMakeLists.txt index 0c2a1f7901..eaa57970a6 100644 --- a/grc/blocks/CMakeLists.txt +++ b/grc/blocks/CMakeLists.txt @@ -39,5 +39,4 @@ add_custom_target(grc_generated_xml ALL DEPENDS ${generated_xml_files}) install( FILES ${xml_files} ${generated_xml_files} DESTINATION ${GRC_BLOCKS_DIR} - COMPONENT "grc" ) diff --git a/grc/core/CMakeLists.txt b/grc/core/CMakeLists.txt index 51b0dacba6..f340127873 100644 --- a/grc/core/CMakeLists.txt +++ b/grc/core/CMakeLists.txt @@ -22,7 +22,6 @@ file(GLOB py_files "*.py") GR_PYTHON_INSTALL( FILES ${py_files} DESTINATION ${GR_PYTHON_DIR}/gnuradio/grc/core - COMPONENT "grc" ) file(GLOB dtd_files "*.dtd") @@ -30,7 +29,6 @@ file(GLOB dtd_files "*.dtd") install( FILES ${dtd_files} default_flow_graph.grc DESTINATION ${GR_PYTHON_DIR}/gnuradio/grc/core - COMPONENT "grc" ) add_subdirectory(generator) diff --git a/grc/core/generator/CMakeLists.txt b/grc/core/generator/CMakeLists.txt index 4bdd59a7a2..492ad7c4ad 100644 --- a/grc/core/generator/CMakeLists.txt +++ b/grc/core/generator/CMakeLists.txt @@ -22,11 +22,9 @@ file(GLOB py_files "*.py") GR_PYTHON_INSTALL( FILES ${py_files} DESTINATION ${GR_PYTHON_DIR}/gnuradio/grc/core/generator - COMPONENT "grc" ) install(FILES flow_graph.tmpl DESTINATION ${GR_PYTHON_DIR}/gnuradio/grc/core/generator - COMPONENT "grc" ) diff --git a/grc/core/utils/CMakeLists.txt b/grc/core/utils/CMakeLists.txt index 2528fbc43c..3ba65258a5 100644 --- a/grc/core/utils/CMakeLists.txt +++ b/grc/core/utils/CMakeLists.txt @@ -22,5 +22,4 @@ file(GLOB py_files "*.py") GR_PYTHON_INSTALL( FILES ${py_files} DESTINATION ${GR_PYTHON_DIR}/gnuradio/grc/core/utils - COMPONENT "grc" ) diff --git a/grc/gui/CMakeLists.txt b/grc/gui/CMakeLists.txt index aa9592b351..12be4a8151 100644 --- a/grc/gui/CMakeLists.txt +++ b/grc/gui/CMakeLists.txt @@ -22,5 +22,4 @@ file(GLOB py_files "*.py") GR_PYTHON_INSTALL( FILES ${py_files} DESTINATION ${GR_PYTHON_DIR}/gnuradio/grc/gui - COMPONENT "grc" ) diff --git a/grc/scripts/CMakeLists.txt b/grc/scripts/CMakeLists.txt index 6cc78c3cf3..9751952118 100644 --- a/grc/scripts/CMakeLists.txt +++ b/grc/scripts/CMakeLists.txt @@ -21,7 +21,6 @@ GR_PYTHON_INSTALL( PROGRAMS gnuradio-companion DESTINATION ${GR_RUNTIME_DIR} - COMPONENT "grc" ) add_subdirectory(freedesktop) diff --git a/grc/scripts/freedesktop/CMakeLists.txt b/grc/scripts/freedesktop/CMakeLists.txt index 47e836f697..f936b366fc 100644 --- a/grc/scripts/freedesktop/CMakeLists.txt +++ b/grc/scripts/freedesktop/CMakeLists.txt @@ -31,7 +31,6 @@ install(FILES gnuradio-grc.xml gnuradio-grc.desktop DESTINATION ${grc_freedesktop_path} - COMPONENT "grc" ) find_program(HAVE_XDG_UTILS xdg-desktop-menu) @@ -44,6 +43,6 @@ if(UNIX AND HAVE_XDG_UTILS) @ONLY) install( PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/grc_setup_freedesktop - DESTINATION ${GR_PKG_LIBEXEC_DIR} COMPONENT "grc" + DESTINATION ${GR_PKG_LIBEXEC_DIR} ) endif(UNIX AND HAVE_XDG_UTILS) |