Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
build: export vapi generation in vpp-dev
[vpp.git]
/
src
/
vpp
/
CMakeLists.txt
diff --git
a/src/vpp/CMakeLists.txt
b/src/vpp/CMakeLists.txt
index
78ca867
..
8f7c2cf
100644
(file)
--- a/
src/vpp/CMakeLists.txt
+++ b/
src/vpp/CMakeLists.txt
@@
-34,18
+34,20
@@
add_custom_target(vpp_version_h
option(VPP_API_TEST_BUILTIN "Use builtin VPP API test." ON)
set(VPP_API_FILES
option(VPP_API_TEST_BUILTIN "Use builtin VPP API test." ON)
set(VPP_API_FILES
+ api/vpe_types.api
api/vpe.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
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}
DESTINATION include/vpp/${dir}
+ COMPONENT vpp-dev
)
endforeach()
)
endforeach()
@@
-53,13
+55,11
@@
set(VPP_SOURCES
vnet/main.c
app/vpe_cli.c
app/version.c
vnet/main.c
app/vpe_cli.c
app/version.c
- oam/oam.c
- oam/oam_api.c
- stats/stats.c
stats/stat_segment.c
api/api.c
api/json_format.c
api/custom_dump.c
stats/stat_segment.c
api/api.c
api/json_format.c
api/custom_dump.c
+ api/types.c
)
if(VPP_API_TEST_BUILTIN)
)
if(VPP_API_TEST_BUILTIN)
@@
-67,6
+67,7
@@
if(VPP_API_TEST_BUILTIN)
api/api_format.c
api/api_main.c
api/plugin.c
api/api_format.c
api/api_main.c
api/plugin.c
+ api/types.c
)
add_definitions(-DVPP_API_TEST_BUILTIN=1)
endif()
)
add_definitions(-DVPP_API_TEST_BUILTIN=1)
endif()
@@
-81,6
+82,8
@@
add_vpp_executable(vpp
add_vpp_headers(vpp
api/vpe_msg_enum.h
api/vpe_all_api_h.h
add_vpp_headers(vpp
api/vpe_msg_enum.h
api/vpe_all_api_h.h
+ stats/stat_segment.h
+ stats/stat_segment_shared.h
)
##############################################################################
)
##############################################################################
@@
-103,18
+106,10
@@
add_vpp_executable(vpp_get_metrics
##############################################################################
# stats binaries
##############################################################################
##############################################################################
# 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
add_vpp_executable(vpp_get_stats
SOURCES app/vpp_get_stats.c
- LINK_LIBRARIES vppapiclient vppinfra
svm vlibmemoryclient
+ LINK_LIBRARIES vppapiclient vppinfra
DEPENDS api_headers
DEPENDS api_headers
- NO_INSTALL
)
add_vpp_executable(vpp_prometheus_export
)
add_vpp_executable(vpp_prometheus_export
@@
-122,3
+117,6
@@
add_vpp_executable(vpp_prometheus_export
LINK_LIBRARIES vppapiclient vppinfra svm vlibmemoryclient
DEPENDS api_headers
)
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)