X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fcmake%2Flibrary.cmake;h=dc14ae59e460720b3455c1395fa4b9dfece79b7c;hb=d8f48e2166747b529aa23762ac314dd686590c89;hp=0d1e97cb6a36a0e6202dc291593d232ad76dc594;hpb=43b06063015abfa42bc9c5ab925cd6b7ea3cbf42;p=vpp.git

diff --git a/src/cmake/library.cmake b/src/cmake/library.cmake
index 0d1e97cb6a3..dc14ae59e46 100644
--- a/src/cmake/library.cmake
+++ b/src/cmake/library.cmake
@@ -20,7 +20,9 @@ macro(add_vpp_library lib)
   )
 
   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)
@@ -32,7 +34,7 @@ macro(add_vpp_library lib)
   endif()
   install(
     TARGETS ${lib}
-    DESTINATION ${VPP_LIB_DIR_NAME}
+    DESTINATION lib
     COMPONENT ${ARG_COMPONENT}
   )
 
@@ -41,11 +43,13 @@ macro(add_vpp_library lib)
   endif()
 
   if(ARG_API_FILES)
-    vpp_add_api_files(${lib} ${ARG_API_FILES})
+    vpp_add_api_files(${lib} core vpp ${ARG_API_FILES})
     foreach(file ${ARG_API_FILES})
       get_filename_component(dir ${file} DIRECTORY)
       install(
-	FILES ${CMAKE_CURRENT_BINARY_DIR}/${file}.h
+	FILES ${file} ${CMAKE_CURRENT_BINARY_DIR}/${file}.h
+	${CMAKE_CURRENT_BINARY_DIR}/${file}_enum.h
+	${CMAKE_CURRENT_BINARY_DIR}/${file}_types.h
 	DESTINATION include/${lib}/${dir}
 	COMPONENT vpp-dev
       )
@@ -63,7 +67,7 @@ macro(add_vpp_library lib)
       install(
 	FILES ${file}
 	DESTINATION include/${lib}/${dir}
-	COMPONENT vpp-dev
+	COMPONENT ${ARG_COMPONENT}-dev
       )
     endforeach()
   endif()
@@ -75,6 +79,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()