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 /gnuradio-runtime/lib | |
| 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 'gnuradio-runtime/lib')
| -rw-r--r-- | gnuradio-runtime/lib/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | gnuradio-runtime/lib/controlport/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | gnuradio-runtime/lib/pmt/CMakeLists.txt | 5 |
3 files changed, 4 insertions, 6 deletions
diff --git a/gnuradio-runtime/lib/CMakeLists.txt b/gnuradio-runtime/lib/CMakeLists.txt index 3da550d37b..e0196b669a 100644 --- a/gnuradio-runtime/lib/CMakeLists.txt +++ b/gnuradio-runtime/lib/CMakeLists.txt @@ -203,7 +203,7 @@ endif(TRY_SHM_VMCIRCBUF) ####################################################### add_library(gnuradio-runtime SHARED ${gnuradio_runtime_sources}) target_link_libraries(gnuradio-runtime ${gnuradio_runtime_libs}) -GR_LIBRARY_FOO(gnuradio-runtime RUNTIME_COMPONENT "runtime_runtime" DEVEL_COMPONENT "runtime_devel") +GR_LIBRARY_FOO(gnuradio-runtime) add_dependencies(gnuradio-runtime pmt_generated runtime_generated_includes @@ -241,7 +241,7 @@ if(ENABLE_STATIC_LIBS) endif(NOT WIN32) install(TARGETS gnuradio-runtime_static - ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT "runtime_devel" # .lib file + ARCHIVE DESTINATION lib${LIB_SUFFIX} # .lib file ) endif(ENABLE_STATIC_LIBS) diff --git a/gnuradio-runtime/lib/controlport/CMakeLists.txt b/gnuradio-runtime/lib/controlport/CMakeLists.txt index c9bdeb949e..80d31fc721 100644 --- a/gnuradio-runtime/lib/controlport/CMakeLists.txt +++ b/gnuradio-runtime/lib/controlport/CMakeLists.txt @@ -84,7 +84,6 @@ list(APPEND gnuradio_runtime_libs install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/thrift/thrift.conf.example DESTINATION ${SYSCONFDIR}/${CMAKE_PROJECT_NAME} - COMPONENT "runtime_runtime" ) endif(THRIFT_FOUND) diff --git a/gnuradio-runtime/lib/pmt/CMakeLists.txt b/gnuradio-runtime/lib/pmt/CMakeLists.txt index 32c0e57a6a..e5c8f2f47e 100644 --- a/gnuradio-runtime/lib/pmt/CMakeLists.txt +++ b/gnuradio-runtime/lib/pmt/CMakeLists.txt @@ -44,7 +44,6 @@ add_custom_command( install( FILES ${PMT_SERIAL_TAGS_H} DESTINATION ${GR_INCLUDE_DIR}/pmt - COMPONENT "runtime_devel" ) include(AddFileDependencies) @@ -108,7 +107,7 @@ endif(MSVC) add_library(gnuradio-pmt SHARED ${pmt_sources}) target_link_libraries(gnuradio-pmt ${gnuradio_pmt_libs}) -GR_LIBRARY_FOO(gnuradio-pmt RUNTIME_COMPONENT "runtime_runtime" DEVEL_COMPONENT "runtime_devel") +GR_LIBRARY_FOO(gnuradio-pmt) add_dependencies(gnuradio-pmt pmt_generated @@ -125,7 +124,7 @@ if(ENABLE_STATIC_LIBS) endif(NOT WIN32) install(TARGETS gnuradio-pmt_static - ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT "runtime_devel" # .lib file + ARCHIVE DESTINATION lib${LIB_SUFFIX} # .lib file ) endif(ENABLE_STATIC_LIBS) |