API: Add support for type aliases

[vpp.git] / src / vpp-api / vapi / CMakeLists.txt

diff --git a/src/vpp-api/vapi/CMakeLists.txt b/src/vpp-api/vapi/CMakeLists.txt
index 8feb12e..120bfd4 100644 (file)
--- a/src/vpp-api/vapi/CMakeLists.txt
+++ b/src/vpp-api/vapi/CMakeLists.txt
@@ -30,10 +30,14 @@ foreach(f ${VPP_API_FILES})
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/vapi_c_gen.py
     ARGS --remove-path ${input}
-    DEPENDS ${input} vapi_c_gen.py vapi_json_parser.py
+    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
@@ -42,15 +46,19 @@ foreach(f ${VPP_API_FILES})
     OUTPUT ${output}
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/vapi_cpp_gen.py
-    ARGS --remove-path ${input}
-    DEPENDS ${input} vapi_cpp_gen.py vapi_json_parser.py
+    ARGS --gen-h-prefix=vapi --remove-path ${input}
+    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 ()
 
-add_custom_target(all-vapi-headers ALL DEPENDS
+add_custom_target(all-vapi-headers DEPENDS
   ${VAPICLIENT_API_C_HEADERS}
   ${VAPICLIENT_API_CPP_HEADERS}
 )
@@ -61,6 +69,7 @@ add_vpp_library(vapiclient
   libvapiclient.map
 
   LINK_LIBRARIES vppinfra vlibmemoryclient svm pthread m rt
+  DEPENDS all-vapi-headers
 )
 
 install(
@@ -72,4 +81,5 @@ install(
   vapi_internal.h
 
   DESTINATION include/vapi
+  COMPONENT vpp-dev
 )