X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvpp%2FCMakeLists.txt;h=ae1e4d76c0209c5e1f0f6d7b842349ac90f0803d;hb=3a6adc52f;hp=16843f73e8a3e804fbb417a9cf49916d50aa543a;hpb=e9b558282293ee28c5eef7cb507dbe3f4a81e5af;p=vpp.git

diff --git a/src/vpp/CMakeLists.txt b/src/vpp/CMakeLists.txt
index 16843f73e8a..ae1e4d76c02 100644
--- a/src/vpp/CMakeLists.txt
+++ b/src/vpp/CMakeLists.txt
@@ -33,18 +33,24 @@ add_custom_target(vpp_version_h
 ##############################################################################
 option(VPP_API_TEST_BUILTIN "Use builtin VPP API test." ON)
 
+configure_file(
+  ${CMAKE_SOURCE_DIR}/vpp/vnet/config.h.in
+  ${CMAKE_BINARY_DIR}/vpp/vnet/config.h
+)
+
 set(VPP_API_FILES
+  api/vpe_types.api
   api/vpe.api
-  stats/stats.api
-  oam/oam.api
 )
 
-vpp_add_api_files(vpp ${VPP_API_FILES})
+vpp_add_api_files(vpp core vpp ${VPP_API_FILES})
 
 foreach(file ${VPP_API_FILES})
   get_filename_component(dir ${file} DIRECTORY)
   install(
     FILES ${CMAKE_CURRENT_BINARY_DIR}/${file}.h
+    ${CMAKE_CURRENT_BINARY_DIR}/${file}_enum.h
+    ${CMAKE_CURRENT_BINARY_DIR}/${file}_types.h
     DESTINATION include/vpp/${dir}
     COMPONENT vpp-dev
   )
@@ -54,13 +60,11 @@ set(VPP_SOURCES
   vnet/main.c
   app/vpe_cli.c
   app/version.c
-  oam/oam.c
-  oam/oam_api.c
-  stats/stats_to_be_deprecated.c
   stats/stat_segment.c
   api/api.c
   api/json_format.c
   api/custom_dump.c
+  api/types.c
 )
 
 if(VPP_API_TEST_BUILTIN)
@@ -68,6 +72,8 @@ if(VPP_API_TEST_BUILTIN)
     api/api_format.c
     api/api_main.c
     api/plugin.c
+    api/types.c
+    ../vnet/arp/arp_test.c
   )
   add_definitions(-DVPP_API_TEST_BUILTIN=1)
 endif()
@@ -83,6 +89,7 @@ add_vpp_headers(vpp
   api/vpe_msg_enum.h
   api/vpe_all_api_h.h
   stats/stat_segment.h
+  stats/stat_segment_shared.h
 )
 
 ##############################################################################
@@ -105,13 +112,6 @@ add_vpp_executable(vpp_get_metrics
 ##############################################################################
 # stats binaries
 ##############################################################################
-add_vpp_executable(summary_stats_client
-  SOURCES api/summary_stats_client.c
-  LINK_LIBRARIES vppinfra svm vlibmemoryclient
-  DEPENDS api_headers
-  NO_INSTALL
-)
-
 add_vpp_executable(vpp_get_stats
   SOURCES app/vpp_get_stats.c
   LINK_LIBRARIES vppapiclient vppinfra
@@ -123,3 +123,6 @@ add_vpp_executable(vpp_prometheus_export
   LINK_LIBRARIES vppapiclient vppinfra svm vlibmemoryclient
   DEPENDS api_headers
 )
+
+install(FILES conf/startup.conf DESTINATION etc/vpp COMPONENT vpp)
+install(FILES conf/80-vpp.conf DESTINATION etc/sysctl.d COMPONENT vpp)