X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvlib%2FCMakeLists.txt;h=b187f980401fbf684a3682b05ef874f93398fcd3;hb=58492a83722caf1c49977d73abf931418ce1f8f2;hp=dceb13e7ce408189b0a11f90cfd8e00b8772d72c;hpb=612dd6a955e44d2c0fed1801fb8de585ca695c63;p=vpp.git

diff --git a/src/vlib/CMakeLists.txt b/src/vlib/CMakeLists.txt
index dceb13e7ce4..b187f980401 100644
--- a/src/vlib/CMakeLists.txt
+++ b/src/vlib/CMakeLists.txt
@@ -19,12 +19,17 @@ 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
 ##############################################################################
-set(VLIB_SRCS
+add_vpp_library(vlib
+  SOURCES
   buffer.c
   buffer_serialize.c
   cli.c
@@ -53,22 +58,15 @@ set(VLIB_SRCS
   unix/mc_socket.c
   unix/plugin.c
   unix/util.c
-)
 
-add_library(vlib SHARED ${VLIB_SRCS})
-target_link_libraries(vlib vppinfra svm ${CMAKE_DL_LIBS})
-install(TARGETS vlib DESTINATION lib)
-
-##############################################################################
-# vlib headers
-##############################################################################
-vpp_add_header_files(vlib
+  INSTALL_HEADERS
   buffer_funcs.h
   buffer.h
   buffer_node.h
   cli_funcs.h
   cli.h
   counter.h
+  counter_types.h
   defs.h
   error_funcs.h
   error.h
@@ -94,5 +92,6 @@ vpp_add_header_files(vlib
   unix/plugin.h
   unix/unix.h
   vlib.h
-)
 
+  LINK_LIBRARIES vppinfra svm ${CMAKE_DL_LIBS}
+)