summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/cmake/api.cmake14
-rw-r--r--src/cmake/library.cmake6
-rw-r--r--src/cmake/plugin.cmake8
-rw-r--r--src/tools/vppapigen/CMakeLists.txt3
-rw-r--r--src/vat/CMakeLists.txt10
-rw-r--r--src/vlib/CMakeLists.txt6
-rw-r--r--src/vlibapi/CMakeLists.txt2
-rw-r--r--src/vpp-api/vapi/CMakeLists.txt13
-rw-r--r--src/vpp/CMakeLists.txt1
9 files changed, 46 insertions, 17 deletions
diff --git a/src/cmake/api.cmake b/src/cmake/api.cmake
index 533448ad16e..d799c54a0a6 100644
--- a/src/cmake/api.cmake
+++ b/src/cmake/api.cmake
@@ -26,7 +26,7 @@ function(vpp_generate_api_c_header file)
)
endfunction()
-function(vpp_generate_api_json_header file dir)
+function(vpp_generate_api_json_header file dir component)
set (output_name ${CMAKE_CURRENT_BINARY_DIR}/${file}.json)
get_filename_component(output_dir ${output_name} DIRECTORY)
add_custom_command (OUTPUT ${output_name}
@@ -36,7 +36,11 @@ function(vpp_generate_api_json_header file dir)
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${file}
COMMENT "Generating API header ${output_name}"
)
- install(FILES ${output_name} DESTINATION share/vpp/api/${dir}/)
+ install(
+ FILES ${output_name}
+ DESTINATION share/vpp/api/${dir}/
+ COMPONENT ${component}
+ )
endfunction()
##############################################################################
@@ -45,9 +49,9 @@ endfunction()
# @param dir - the install directory under ROOT/share/vpp/api to place the
# generated .json file
##############################################################################
-function(vpp_generate_api_header file dir)
+function(vpp_generate_api_header file dir component)
vpp_generate_api_c_header (${file})
- vpp_generate_api_json_header (${file} ${dir})
+ vpp_generate_api_json_header (${file} ${dir} ${component})
endfunction()
function(vpp_add_api_files name)
@@ -55,7 +59,7 @@ function(vpp_add_api_files name)
set(target ${name}_api_headers)
file(RELATIVE_PATH rpath ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
foreach(file ${ARGN})
- vpp_generate_api_header (${file} core)
+ vpp_generate_api_header (${file} core vpp)
list(APPEND header_files ${file}.h ${file}.json)
set_property(GLOBAL APPEND PROPERTY VPP_API_FILES ${rpath}/${file})
endforeach()
diff --git a/src/cmake/library.cmake b/src/cmake/library.cmake
index cff5e3e3f2f..04165ffb1e4 100644
--- a/src/cmake/library.cmake
+++ b/src/cmake/library.cmake
@@ -76,6 +76,10 @@ endmacro()
function (add_vpp_headers path)
foreach(file ${ARGN})
get_filename_component(dir ${file} DIRECTORY)
- install(FILES ${file} DESTINATION include/${path}/${dir})
+ install(
+ FILES ${file}
+ DESTINATION include/${path}/${dir}
+ COMPONENT vpp-dev
+ )
endforeach()
endfunction()
diff --git a/src/cmake/plugin.cmake b/src/cmake/plugin.cmake
index 9f9a6460f0f..c6f551dd3d5 100644
--- a/src/cmake/plugin.cmake
+++ b/src/cmake/plugin.cmake
@@ -20,10 +20,13 @@ macro(add_vpp_plugin name)
)
set(plugin_name ${name}_plugin)
set(api_headers)
+ if(NOT PLUGIN_COMPONENT)
+ set(PLUGIN_COMPONENT vpp-plugin-misc)
+ endif()
file(RELATIVE_PATH rpath ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
foreach(f ${PLUGIN_API_FILES})
get_filename_component(dir ${f} DIRECTORY)
- vpp_generate_api_header(${f} plugins)
+ vpp_generate_api_header(${f} plugins ${PLUGIN_COMPONENT})
list(APPEND api_headers ${f}.h ${f}.json)
set_property(GLOBAL APPEND PROPERTY VPP_API_FILES ${rpath}/${f})
install(
@@ -57,9 +60,6 @@ macro(add_vpp_plugin name)
)
endforeach()
endif()
- if(NOT PLUGIN_COMPONENT)
- set(PLUGIN_COMPONENT vpp-plugin-misc)
- endif()
if(PLUGIN_API_TEST_SOURCES)
set(test_plugin_name ${name}_test_plugin)
add_library(${test_plugin_name} SHARED ${PLUGIN_API_TEST_SOURCES} ${api_headers})
diff --git a/src/tools/vppapigen/CMakeLists.txt b/src/tools/vppapigen/CMakeLists.txt
index 2898f506b6a..0d982fe29f8 100644
--- a/src/tools/vppapigen/CMakeLists.txt
+++ b/src/tools/vppapigen/CMakeLists.txt
@@ -18,6 +18,7 @@ install(
PERMISSIONS
OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE
WORLD_READ WORLD_EXECUTE
+ COMPONENT vpp-dev
)
-install(FILES C.py JSON.py DESTINATION share/vpp)
+install(FILES C.py JSON.py DESTINATION share/vpp COMPONENT vpp-dev)
diff --git a/src/vat/CMakeLists.txt b/src/vat/CMakeLists.txt
index feb335c0679..bc26c3e5c23 100644
--- a/src/vat/CMakeLists.txt
+++ b/src/vat/CMakeLists.txt
@@ -22,7 +22,7 @@ add_vpp_library(vatplugin
##############################################################################
# vpp_api_test
##############################################################################
-add_vpp_executable(vpp_api_test ENABLE_EXPORTS
+add_vpp_executable(vpp_api_test ENABLE_EXPORTS NO_INSTALL
SOURCES
api_format.c
main.c
@@ -41,7 +41,7 @@ add_vpp_executable(vpp_api_test ENABLE_EXPORTS
##############################################################################
# vpp_json_test
##############################################################################
-add_vpp_executable(vpp_json_test ENABLE_EXPORTS
+add_vpp_executable(vpp_json_test ENABLE_EXPORTS NO_INSTALL
SOURCES json_format.c json_test.c
LINK_LIBRARIES vppinfra m
)
@@ -49,7 +49,11 @@ add_vpp_executable(vpp_json_test ENABLE_EXPORTS
##############################################################################
# vat headers
##############################################################################
-install(FILES vat.h json_format.h DESTINATION include/vat)
+install(
+ FILES vat.h json_format.h
+ DESTINATION include/vat
+ COMPONENT vpp-dev
+)
##############################################################################
# restart
diff --git a/src/vlib/CMakeLists.txt b/src/vlib/CMakeLists.txt
index 59c725fbc5f..c3dfba924a5 100644
--- a/src/vlib/CMakeLists.txt
+++ b/src/vlib/CMakeLists.txt
@@ -19,7 +19,11 @@ configure_file(
${CMAKE_SOURCE_DIR}/vlib/config.h.in
${CMAKE_BINARY_DIR}/vlib/config.h
)
-install(FILES ${CMAKE_BINARY_DIR}/vlib/config.h DESTINATION include/vlib)
+install(
+ FILES ${CMAKE_BINARY_DIR}/vlib/config.h
+ DESTINATION include/vlib
+ COMPONENT vpp-dev
+)
##############################################################################
# vlib shared library
diff --git a/src/vlibapi/CMakeLists.txt b/src/vlibapi/CMakeLists.txt
index 6c67008a1a7..55f87b8f7ac 100644
--- a/src/vlibapi/CMakeLists.txt
+++ b/src/vlibapi/CMakeLists.txt
@@ -20,4 +20,6 @@ install(
DESTINATION
include/vlibapi
+
+ COMPONENT vpp-dev
)
diff --git a/src/vpp-api/vapi/CMakeLists.txt b/src/vpp-api/vapi/CMakeLists.txt
index abf9ffb14fa..120bfd4d69f 100644
--- a/src/vpp-api/vapi/CMakeLists.txt
+++ b/src/vpp-api/vapi/CMakeLists.txt
@@ -33,7 +33,11 @@ foreach(f ${VPP_API_FILES})
DEPENDS ${input} vapi_c_gen.py vapi_json_parser.py api_headers
COMMENT "Generating VAPI C header ${output}"
)
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${output} DESTINATION include/vapi)
+ install(
+ FILES ${CMAKE_CURRENT_BINARY_DIR}/${output}
+ DESTINATION include/vapi
+ COMPONENT vpp-dev
+ )
list(APPEND VAPICLIENT_API_CPP_HEADERS ${output})
# C++ VAPI Headers
@@ -46,7 +50,11 @@ foreach(f ${VPP_API_FILES})
DEPENDS ${input} vapi_cpp_gen.py vapi_json_parser.py api_headers
COMMENT "Generating VAPI C++ header ${output}"
)
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${output} DESTINATION include/vapi)
+ install(
+ FILES ${CMAKE_CURRENT_BINARY_DIR}/${output}
+ DESTINATION include/vapi
+ COMPONENT vpp-dev
+ )
list(APPEND VAPICLIENT_API_CPP_HEADERS ${output})
endforeach ()
@@ -73,4 +81,5 @@ install(
vapi_internal.h
DESTINATION include/vapi
+ COMPONENT vpp-dev
)
diff --git a/src/vpp/CMakeLists.txt b/src/vpp/CMakeLists.txt
index 78ca867abff..feb75cf5a80 100644
--- a/src/vpp/CMakeLists.txt
+++ b/src/vpp/CMakeLists.txt
@@ -46,6 +46,7 @@ foreach(file ${VPP_API_FILES})
install(
FILES ${CMAKE_CURRENT_BINARY_DIR}/${file}.h
DESTINATION include/vpp/${dir}
+ COMPONENT vpp-dev
)
endforeach()