diff options
| author | Josh Blum | 2011-07-22 14:57:27 -0700 |
|---|---|---|
| committer | Josh Blum | 2011-07-22 14:57:27 -0700 |
| commit | d6334f04e0b20b8b017692126ca9754776a63011 (patch) | |
| tree | 99f2d1d2ccc28f17fda6e6cab18a303c089902db | |
| parent | 01981660bf39fa59002f0908ae3e44475f046465 (diff) | |
| download | gnuradio-d6334f04e0b20b8b017692126ca9754776a63011.tar.gz gnuradio-d6334f04e0b20b8b017692126ca9754776a63011.tar.bz2 gnuradio-d6334f04e0b20b8b017692126ca9754776a63011.zip | |
volk: make volk a gr component in the top level
| -rw-r--r-- | CMakeLists.txt | 23 | ||||
| -rw-r--r-- | volk/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | volk/lib/CMakeLists.txt | 6 |
3 files changed, 31 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index ba3ff8e2d..d8af33bac 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -145,12 +145,33 @@ ENDIF() ######################################################################## # Setup volk as a subproject ######################################################################## -ADD_SUBDIRECTORY(volk) +INCLUDE(GrComponent) +GR_REGISTER_COMPONENT("volk" ENABLE_VOLK) + SET(VOLK_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/volk/include ${CMAKE_CURRENT_BINARY_DIR}/volk/include ) +INCLUDE(GrPackage) +CPACK_SET(CPACK_COMPONENT_GROUP_VOLK_DESCRIPTION "Vector optimized library of kernels") + +CPACK_COMPONENT("volk_runtime" + GROUP "Volk" + DISPLAY_NAME "Runtime" + DESCRIPTION "Dynamic link libraries" +) + +CPACK_COMPONENT("volk_devel" + GROUP "Volk" + DISPLAY_NAME "Development" + DESCRIPTION "C++ headers, package config, import libraries" +) + +IF(ENABLE_VOLK) + ADD_SUBDIRECTORY(volk) +ENDIF(ENABLE_VOLK) + ######################################################################## # Add subdirectories ######################################################################## diff --git a/volk/CMakeLists.txt b/volk/CMakeLists.txt index 92f330767..743f07925 100644 --- a/volk/CMakeLists.txt +++ b/volk/CMakeLists.txt @@ -58,6 +58,7 @@ CONFIGURE_FILE( INSTALL( FILES ${CMAKE_CURRENT_BINARY_DIR}/volk.pc DESTINATION lib${LIB_SUFFIX}/pkgconfig + COMPONENT "volk_devel" ) ######################################################################## @@ -65,7 +66,8 @@ INSTALL( ######################################################################## INSTALL( DIRECTORY ${CMAKE_SOURCE_DIR}/include/volk - DESTINATION include FILES_MATCHING PATTERN "*.h" + DESTINATION include COMPONENT "volk_devel" + FILES_MATCHING PATTERN "*.h" ) INSTALL(FILES @@ -73,7 +75,9 @@ INSTALL(FILES ${CMAKE_BINARY_DIR}/include/volk/volk_cpu.h ${CMAKE_BINARY_DIR}/include/volk/volk_config_fixed.h ${CMAKE_BINARY_DIR}/include/volk/volk_typedefs.h -DESTINATION include/volk) + DESTINATION include/volk + COMPONENT "volk_devel" +) ######################################################################## # Setup the library diff --git a/volk/lib/CMakeLists.txt b/volk/lib/CMakeLists.txt index 0050f5f25..c8b9449a6 100644 --- a/volk/lib/CMakeLists.txt +++ b/volk/lib/CMakeLists.txt @@ -252,9 +252,9 @@ SET_TARGET_PROPERTIES(volk PROPERTIES SOVERSION ${LIBVER}) SET_TARGET_PROPERTIES(volk PROPERTIES DEFINE_SYMBOL "volk_EXPORTS") INSTALL(TARGETS volk - LIBRARY DESTINATION lib${LIB_SUFFIX} # .so file - ARCHIVE DESTINATION lib${LIB_SUFFIX} # .lib file - RUNTIME DESTINATION bin # .dll file + LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT "volk_runtime" # .so file + ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT "volk_devel" # .lib file + RUNTIME DESTINATION bin COMPONENT "volk_runtime" # .dll file ) ######################################################################## |