X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvpp-api%2Fvapi%2FCMakeLists.txt;h=4c74ae8092873159fc02039da1c4155a28b38fa5;hb=dc20371f83ed81462c0b24eb750b76f7819df64a;hp=abf9ffb14fa7615c78e9243e50e4f708f70fd951;hpb=d1318256bfa69218beb10f9c9c0a5fcf1481eaf2;p=vpp.git

diff --git a/src/vpp-api/vapi/CMakeLists.txt b/src/vpp-api/vapi/CMakeLists.txt
index abf9ffb14fa..4c74ae80928 100644
--- a/src/vpp-api/vapi/CMakeLists.txt
+++ b/src/vpp-api/vapi/CMakeLists.txt
@@ -16,61 +16,45 @@ include_directories (
   ${CMAKE_CURRENT_BINARY_DIR}/..
 )
 
-unset(VAPICLIENT_API_C_HEADERS)
-unset(VAPICLIENT_API_CPP_HEADERS)
-
-get_property(VPP_API_FILES GLOBAL PROPERTY VPP_API_FILES)
-foreach(f ${VPP_API_FILES})
-  get_filename_component(output ${f}.vapi.h NAME)
-  set(input ${CMAKE_BINARY_DIR}/${f}.json)
-
-  # C VAPI Headers
-  add_custom_command(
-    OUTPUT ${output}
-    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 api_headers
-    COMMENT "Generating VAPI C header ${output}"
-  )
-  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${output} DESTINATION include/vapi)
-  list(APPEND VAPICLIENT_API_CPP_HEADERS ${output})
-
-  # C++ VAPI Headers
-  get_filename_component(output ${f}.vapi.hpp NAME)
-  add_custom_command(
-    OUTPUT ${output}
-    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-    COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/vapi_cpp_gen.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)
-  list(APPEND VAPICLIENT_API_CPP_HEADERS ${output})
-endforeach ()
-
-add_custom_target(all-vapi-headers DEPENDS
-  ${VAPICLIENT_API_C_HEADERS}
-  ${VAPICLIENT_API_CPP_HEADERS}
-)
-
 add_vpp_library(vapiclient
   SOURCES
   vapi.c
   libvapiclient.map
 
   LINK_LIBRARIES vppinfra vlibmemoryclient svm pthread m rt
-  DEPENDS all-vapi-headers
+  DEPENDS api_headers
 )
 
 install(
   FILES
-  vapi.h
-  vapi_common.h
-  vapi_dbg.h
-  vapi.hpp
-  vapi_internal.h
+    vapi.h
+    vapi_common.h
+    vapi_dbg.h
+    vapi.hpp
+    vapi_internal.h
+  DESTINATION
+    include/vapi
+  COMPONENT
+    vpp-dev
+)
+
+install(
+  FILES
+    vapi_c_gen.py
+    vapi_json_parser.py
+    vapi_cpp_gen.py
+  DESTINATION
+    share/vpp
+  COMPONENT
+    vpp-dev
+)
+
+install(
+  PROGRAMS
+  vapi_c_gen.py
+  vapi_cpp_gen.py
+  vapi_json_parser.py
 
-  DESTINATION include/vapi
+  DESTINATION bin
+  COMPONENT vpp-dev
 )