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 /gr-fec | |
| 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 'gr-fec')
| -rw-r--r-- | gr-fec/CMakeLists.txt | 35 | ||||
| -rw-r--r-- | gr-fec/apps/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | gr-fec/examples/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | gr-fec/grc/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | gr-fec/include/gnuradio/fec/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | gr-fec/lib/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | gr-fec/lib/reed-solomon/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | gr-fec/lib/viterbi/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | gr-fec/python/fec/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | gr-fec/python/fec/LDPC/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | gr-fec/python/fec/polar/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | gr-fec/swig/CMakeLists.txt | 2 |
12 files changed, 10 insertions, 55 deletions
diff --git a/gr-fec/CMakeLists.txt b/gr-fec/CMakeLists.txt index 338fe71864..c828fd92e7 100644 --- a/gr-fec/CMakeLists.txt +++ b/gr-fec/CMakeLists.txt @@ -52,40 +52,6 @@ SET(GR_PKG_FEC_EXAMPLES_DIR ${GR_PKG_DATA_DIR}/examples/fec) if(ENABLE_GR_FEC) ######################################################################## -# Setup CPack components -######################################################################## -include(GrPackage) -CPACK_SET(CPACK_COMPONENT_GROUP_FEC_DESCRIPTION "GNU Radio FEC Blocks") - -CPACK_COMPONENT("fec_runtime" - GROUP "FEC" - DISPLAY_NAME "Runtime" - DESCRIPTION "Runtime" - DEPENDS "runtime_runtime" -) - -CPACK_COMPONENT("fec_devel" - GROUP "FEC" - DISPLAY_NAME "Development" - DESCRIPTION "C++ headers, package config, import libraries" - DEPENDS "runtime_devel" -) - -CPACK_COMPONENT("fec_python" - GROUP "FEC" - DISPLAY_NAME "Python" - DESCRIPTION "Python modules for runtime; GRC xml files" - DEPENDS "runtime_python;fec_runtime" -) - -CPACK_COMPONENT("fec_swig" - GROUP "FEC" - DISPLAY_NAME "SWIG" - DESCRIPTION "SWIG development .i files" - DEPENDS "runtime_swig;fec_python;fec_devel" -) - -######################################################################## # Add subdirectories ######################################################################## add_subdirectory(include/gnuradio/fec) @@ -112,7 +78,6 @@ configure_file( install( FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-fec.pc DESTINATION ${GR_LIBRARY_DIR}/pkgconfig - COMPONENT "fec_devel" ) endif(ENABLE_GR_FEC) diff --git a/gr-fec/apps/CMakeLists.txt b/gr-fec/apps/CMakeLists.txt index 62fc6d26d4..41c6e4e2fc 100644 --- a/gr-fec/apps/CMakeLists.txt +++ b/gr-fec/apps/CMakeLists.txt @@ -32,11 +32,9 @@ # #INSTALL(TARGETS # DESTINATION ${GR_RUNTIME_DIR} -# COMPONENT "fec_devel" #) # #GR_PYTHON_INSTALL( # PROGRAMS # DESTINATION ${GR_RUNTIME_DIR} -# COMPONENT "fec_devel" #) diff --git a/gr-fec/examples/CMakeLists.txt b/gr-fec/examples/CMakeLists.txt index e1dfc4ebaf..a66df61ad0 100644 --- a/gr-fec/examples/CMakeLists.txt +++ b/gr-fec/examples/CMakeLists.txt @@ -40,5 +40,4 @@ install( polar_code_example.grc tpc_ber_curve_gen.grc DESTINATION ${GR_PKG_FEC_EXAMPLES_DIR} - COMPONENT "fec_python" ) diff --git a/gr-fec/grc/CMakeLists.txt b/gr-fec/grc/CMakeLists.txt index 27cb5af854..f61603df22 100644 --- a/gr-fec/grc/CMakeLists.txt +++ b/gr-fec/grc/CMakeLists.txt @@ -19,4 +19,8 @@ ######################################################################## file(GLOB xml_files "*.xml") -install(FILES ${xml_files} DESTINATION ${GRC_BLOCKS_DIR} COMPONENT "fec_python") + +install(FILES + ${xml_files} + DESTINATION ${GRC_BLOCKS_DIR} +) diff --git a/gr-fec/include/gnuradio/fec/CMakeLists.txt b/gr-fec/include/gnuradio/fec/CMakeLists.txt index 57594b47d8..5894b1d14a 100644 --- a/gr-fec/include/gnuradio/fec/CMakeLists.txt +++ b/gr-fec/include/gnuradio/fec/CMakeLists.txt @@ -60,8 +60,8 @@ install(FILES polar_decoder_sc_list.h polar_decoder_common.h polar_encoder_systematic.h - polar_decoder_sc_systematic.h DESTINATION ${GR_INCLUDE_DIR}/gnuradio/fec - COMPONENT "fec_devel" + polar_decoder_sc_systematic.h + DESTINATION ${GR_INCLUDE_DIR}/gnuradio/fec ) if(GSL_FOUND) @@ -73,6 +73,5 @@ if(GSL_FOUND) ldpc_par_mtrx_encoder.h ldpc_gen_mtrx_encoder.h DESTINATION ${GR_INCLUDE_DIR}/gnuradio/fec - COMPONENT "fec_devel" ) endif(GSL_FOUND) diff --git a/gr-fec/lib/CMakeLists.txt b/gr-fec/lib/CMakeLists.txt index bda98016b0..7ed38404f3 100644 --- a/gr-fec/lib/CMakeLists.txt +++ b/gr-fec/lib/CMakeLists.txt @@ -131,7 +131,7 @@ endif(GSL_FOUND) add_library(gnuradio-fec SHARED ${gnuradio_fec_sources}) target_link_libraries(gnuradio-fec ${gnuradio_fec_libs}) -GR_LIBRARY_FOO(gnuradio-fec RUNTIME_COMPONENT "fec_runtime" DEVEL_COMPONENT "fec_devel") +GR_LIBRARY_FOO(gnuradio-fec) if(ENABLE_STATIC_LIBS) if(ENABLE_GR_CTRLPORT) @@ -153,6 +153,6 @@ if(ENABLE_STATIC_LIBS) endif(NOT WIN32) install(TARGETS gnuradio-fec_static - ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT "fec_devel" # .lib file + ARCHIVE DESTINATION lib${LIB_SUFFIX} # .lib file ) endif(ENABLE_STATIC_LIBS) diff --git a/gr-fec/lib/reed-solomon/CMakeLists.txt b/gr-fec/lib/reed-solomon/CMakeLists.txt index 0858a670c5..3d35c9025d 100644 --- a/gr-fec/lib/reed-solomon/CMakeLists.txt +++ b/gr-fec/lib/reed-solomon/CMakeLists.txt @@ -46,7 +46,6 @@ list(APPEND gnuradio_fec_sources ${gr_fec_rs_sources}) #install( # FILES ${CMAKE_CURRENT_SOURCE_DIR}/rs.h # DESTINATION ${GR_INCLUDE_DIR}/gnuradio/fec -# COMPONENT "fec_devel" #) ######################################################################## diff --git a/gr-fec/lib/viterbi/CMakeLists.txt b/gr-fec/lib/viterbi/CMakeLists.txt index 3697787bcc..10c5940246 100644 --- a/gr-fec/lib/viterbi/CMakeLists.txt +++ b/gr-fec/lib/viterbi/CMakeLists.txt @@ -51,7 +51,6 @@ list(APPEND gnuradio_fec_sources ${viterbi_sources}) #install( # FILES ${CMAKE_CURRENT_SOURCE_DIR}/viterbi.h # DESTINATION ${GR_INCLUDE_DIR}/gnuradio/fec -# COMPONENT "fec_devel" #) ######################################################################## diff --git a/gr-fec/python/fec/CMakeLists.txt b/gr-fec/python/fec/CMakeLists.txt index 1b20004e6e..9d170b0423 100644 --- a/gr-fec/python/fec/CMakeLists.txt +++ b/gr-fec/python/fec/CMakeLists.txt @@ -36,7 +36,6 @@ GR_PYTHON_INSTALL( fec_test.py bercurve_generator.py DESTINATION ${GR_PYTHON_DIR}/gnuradio/fec - COMPONENT "fec_python" ) add_subdirectory(polar) diff --git a/gr-fec/python/fec/LDPC/CMakeLists.txt b/gr-fec/python/fec/LDPC/CMakeLists.txt index 3e56ef3975..d2022412b3 100644 --- a/gr-fec/python/fec/LDPC/CMakeLists.txt +++ b/gr-fec/python/fec/LDPC/CMakeLists.txt @@ -26,5 +26,4 @@ GR_PYTHON_INSTALL( Generate_LDPC_matrix_functions.py Generate_LDPC_matrix.py DESTINATION ${GR_PYTHON_DIR}/gnuradio/fec/LDPC - COMPONENT "fec_python" -)
\ No newline at end of file +) diff --git a/gr-fec/python/fec/polar/CMakeLists.txt b/gr-fec/python/fec/polar/CMakeLists.txt index a863995aff..1efed062ff 100644 --- a/gr-fec/python/fec/polar/CMakeLists.txt +++ b/gr-fec/python/fec/polar/CMakeLists.txt @@ -28,14 +28,10 @@ GR_PYTHON_INSTALL( channel_construction_bec.py helper_functions.py DESTINATION ${GR_PYTHON_DIR}/gnuradio/fec/polar - COMPONENT "fec_python" ) GR_PYTHON_INSTALL( PROGRAMS polar_channel_construction DESTINATION ${GR_RUNTIME_DIR} - COMPONENT "fec_python" ) - - diff --git a/gr-fec/swig/CMakeLists.txt b/gr-fec/swig/CMakeLists.txt index 443d365c98..5eaa5de748 100644 --- a/gr-fec/swig/CMakeLists.txt +++ b/gr-fec/swig/CMakeLists.txt @@ -48,7 +48,6 @@ GR_SWIG_MAKE(fec_swig fec_swig.i) GR_SWIG_INSTALL( TARGETS fec_swig DESTINATION ${GR_PYTHON_DIR}/gnuradio/fec - COMPONENT "fec_python" ) install( @@ -56,5 +55,4 @@ install( fec_swig.i ${CMAKE_CURRENT_BINARY_DIR}/fec_swig_doc.i DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig - COMPONENT "fec_swig" ) |