summaryrefslogtreecommitdiff
path: root/gr-video-sdl
diff options
context:
space:
mode:
Diffstat (limited to 'gr-video-sdl')
-rw-r--r--gr-video-sdl/CMakeLists.txt35
-rw-r--r--gr-video-sdl/grc/CMakeLists.txt2
-rw-r--r--gr-video-sdl/include/gnuradio/video_sdl/CMakeLists.txt1
-rw-r--r--gr-video-sdl/lib/CMakeLists.txt4
-rw-r--r--gr-video-sdl/python/video_sdl/CMakeLists.txt1
-rw-r--r--gr-video-sdl/swig/CMakeLists.txt2
6 files changed, 2 insertions, 43 deletions
diff --git a/gr-video-sdl/CMakeLists.txt b/gr-video-sdl/CMakeLists.txt
index 50975eb67..a171535c3 100644
--- a/gr-video-sdl/CMakeLists.txt
+++ b/gr-video-sdl/CMakeLists.txt
@@ -45,40 +45,6 @@ GR_SET_GLOBAL(GR_VIDEO_SDL_INCLUDE_DIRS
if(ENABLE_GR_VIDEO_SDL)
########################################################################
-# Setup CPack components
-########################################################################
-include(GrPackage)
-CPACK_SET(CPACK_COMPONENT_GROUP_VIDEO_SDL_DESCRIPTION "GNU Radio Video SDL Blocks")
-
-CPACK_COMPONENT("video_sdl_runtime"
- GROUP "Video SDL"
- DISPLAY_NAME "Runtime"
- DESCRIPTION "Runtime"
- DEPENDS "runtime_runtime"
-)
-
-CPACK_COMPONENT("video_sdl_devel"
- GROUP "Video SDL"
- DISPLAY_NAME "Development"
- DESCRIPTION "C++ headers, package config, import libraries"
- DEPENDS "runtime_devel"
-)
-
-CPACK_COMPONENT("video_sdl_python"
- GROUP "Video SDL"
- DISPLAY_NAME "Python"
- DESCRIPTION "Python modules for runtime; GRC xml files"
- DEPENDS "runtime_python;video_sdl_runtime"
-)
-
-CPACK_COMPONENT("video_sdl_swig"
- GROUP "Video SDL"
- DISPLAY_NAME "SWIG"
- DESCRIPTION "SWIG development .i files"
- DEPENDS "runtime_swig;video_sdl_python;video_sdl_devel"
-)
-
-########################################################################
# Add subdirectories
########################################################################
add_subdirectory(include/gnuradio/video_sdl)
@@ -100,7 +66,6 @@ configure_file(
install(
FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-video-sdl.pc
DESTINATION ${GR_LIBRARY_DIR}/pkgconfig
- COMPONENT "video_sdl_devel"
)
endif(ENABLE_GR_VIDEO_SDL)
diff --git a/gr-video-sdl/grc/CMakeLists.txt b/gr-video-sdl/grc/CMakeLists.txt
index b69622427..f62d41b6d 100644
--- a/gr-video-sdl/grc/CMakeLists.txt
+++ b/gr-video-sdl/grc/CMakeLists.txt
@@ -23,5 +23,3 @@ install(FILES
DESTINATION share/gnuradio/grc/blocks
)
-
-
diff --git a/gr-video-sdl/include/gnuradio/video_sdl/CMakeLists.txt b/gr-video-sdl/include/gnuradio/video_sdl/CMakeLists.txt
index 8831fd817..97b211031 100644
--- a/gr-video-sdl/include/gnuradio/video_sdl/CMakeLists.txt
+++ b/gr-video-sdl/include/gnuradio/video_sdl/CMakeLists.txt
@@ -25,6 +25,5 @@ install(FILES
sink_s.h
sink_uc.h
DESTINATION ${GR_INCLUDE_DIR}/gnuradio/video_sdl
- COMPONENT "video_sdl_devel"
)
diff --git a/gr-video-sdl/lib/CMakeLists.txt b/gr-video-sdl/lib/CMakeLists.txt
index 42ad24e3f..d43f0bb91 100644
--- a/gr-video-sdl/lib/CMakeLists.txt
+++ b/gr-video-sdl/lib/CMakeLists.txt
@@ -65,7 +65,7 @@ ENDIF(MSVC)
add_library(gnuradio-video-sdl SHARED ${video_sdl_sources})
target_link_libraries(gnuradio-video-sdl ${video_sdl_libs})
-GR_LIBRARY_FOO(gnuradio-video-sdl RUNTIME_COMPONENT "video_sdl_runtime" DEVEL_COMPONENT "video_sdl_devel")
+GR_LIBRARY_FOO(gnuradio-video-sdl)
add_dependencies(gnuradio-video-sdl gnuradio-runtime)
if(ENABLE_STATIC_LIBS)
@@ -90,6 +90,6 @@ if(ENABLE_STATIC_LIBS)
endif(NOT WIN32)
install(TARGETS gnuradio-video-sdl_static
- ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT "video_sdl_devel" # .lib file
+ ARCHIVE DESTINATION lib${LIB_SUFFIX} # .lib file
)
endif(ENABLE_STATIC_LIBS)
diff --git a/gr-video-sdl/python/video_sdl/CMakeLists.txt b/gr-video-sdl/python/video_sdl/CMakeLists.txt
index 7b2f01aac..6465affa1 100644
--- a/gr-video-sdl/python/video_sdl/CMakeLists.txt
+++ b/gr-video-sdl/python/video_sdl/CMakeLists.txt
@@ -26,7 +26,6 @@ GR_PYTHON_INSTALL(
FILES
__init__.py
DESTINATION ${GR_PYTHON_DIR}/gnuradio/video_sdl
- COMPONENT "video_sdl_python"
)
########################################################################
diff --git a/gr-video-sdl/swig/CMakeLists.txt b/gr-video-sdl/swig/CMakeLists.txt
index 46343741a..0d5974f21 100644
--- a/gr-video-sdl/swig/CMakeLists.txt
+++ b/gr-video-sdl/swig/CMakeLists.txt
@@ -48,7 +48,6 @@ GR_SWIG_MAKE(video_sdl_swig video_sdl_swig.i)
GR_SWIG_INSTALL(
TARGETS video_sdl_swig
DESTINATION ${GR_PYTHON_DIR}/gnuradio/video_sdl
- COMPONENT "video_sdl_python"
)
install(
@@ -56,5 +55,4 @@ install(
video_sdl_swig.i
${CMAKE_CURRENT_BINARY_DIR}/video_sdl_swig_doc.i
DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig
- COMPONENT "video_sdl_swig"
)