X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fcmake%2Flibrary.cmake;h=b9e4f9b4bd8da032a14c48baa488084d4feede74;hb=e166fd90d68e8b2e4c10529652992465bdf4e8c3;hp=6aa0ae848f912d0210fc170880e4f2e8674d603f;hpb=c261760d907a67ba9548104140785771668d8e83;p=vpp.git

diff --git a/src/cmake/library.cmake b/src/cmake/library.cmake
index 6aa0ae848f9..b9e4f9b4bd8 100644
--- a/src/cmake/library.cmake
+++ b/src/cmake/library.cmake
@@ -14,29 +14,44 @@
 macro(add_vpp_library lib)
   cmake_parse_arguments(ARG
     ""
-    ""
+    "COMPONENT"
     "SOURCES;MULTIARCH_SOURCES;API_FILES;LINK_LIBRARIES;INSTALL_HEADERS;DEPENDS"
     ${ARGN}
   )
 
   add_library(${lib} SHARED ${ARG_SOURCES})
+  target_compile_options(${lib} PRIVATE -Wall)
+  if(VPP_LIB_VERSION)
+    set_target_properties(${lib} PROPERTIES SOVERSION ${VPP_LIB_VERSION})
+  endif()
 
   # library deps
   if(ARG_LINK_LIBRARIES)
     target_link_libraries(${lib} ${ARG_LINK_LIBRARIES})
   endif()
   # install .so
-  install(TARGETS ${lib} DESTINATION ${VPP_LIB_DIR_NAME})
+  if(NOT ARG_COMPONENT)
+    set(ARG_COMPONENT vpp)
+  endif()
+  install(
+    TARGETS ${lib}
+    DESTINATION lib
+    COMPONENT ${ARG_COMPONENT}
+  )
 
   if(ARG_MULTIARCH_SOURCES)
     vpp_library_set_multiarch_sources(${lib} ${ARG_MULTIARCH_SOURCES})
   endif()
 
   if(ARG_API_FILES)
-    vpp_add_api_files(${lib}_api_headers ${ARG_API_FILES})
+    vpp_add_api_files(${lib} ${ARG_API_FILES})
     foreach(file ${ARG_API_FILES})
       get_filename_component(dir ${file} DIRECTORY)
-      install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${file}.h DESTINATION include/${lib}/${dir})
+      install(
+	FILES ${CMAKE_CURRENT_BINARY_DIR}/${file}.h
+	DESTINATION include/${lib}/${dir}
+	COMPONENT vpp-dev
+      )
     endforeach()
   endif()
 
@@ -48,7 +63,11 @@ macro(add_vpp_library lib)
   if(ARG_INSTALL_HEADERS)
     foreach(file ${ARG_INSTALL_HEADERS})
       get_filename_component(dir ${file} DIRECTORY)
-      install(FILES ${file} DESTINATION include/${lib}/${dir})
+      install(
+	FILES ${file}
+	DESTINATION include/${lib}/${dir}
+	COMPONENT vpp-dev
+      )
     endforeach()
   endif()
 endmacro()
@@ -59,6 +78,10 @@ endmacro()
 function (add_vpp_headers path)
   foreach(file ${ARGN})
     get_filename_component(dir ${file} DIRECTORY)
-    install(FILES ${file} DESTINATION include/${path}/${dir})
+    install(
+      FILES ${file}
+      DESTINATION include/${path}/${dir}
+      COMPONENT vpp-dev
+    )
   endforeach()
 endfunction()