X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fcmake%2Flibrary.cmake;h=dc14ae59e460720b3455c1395fa4b9dfece79b7c;hb=dc20371f83ed81462c0b24eb750b76f7819df64a;hp=04165ffb1e438aa728bade20a3670abd3aa9fdb2;hpb=833de8cab672c806176d580a1ebc001f394b2eaf;p=vpp.git

diff --git a/src/cmake/library.cmake b/src/cmake/library.cmake
index 04165ffb1e4..dc14ae59e46 100644
--- a/src/cmake/library.cmake
+++ b/src/cmake/library.cmake
@@ -20,8 +20,9 @@ macro(add_vpp_library lib)
   )
 
   add_library(${lib} SHARED ${ARG_SOURCES})
-  target_compile_options(${lib} PRIVATE -Wall)
-  set_target_properties(${lib} PROPERTIES SOVERSION ${VPP_LIB_VERSION})
+  if(VPP_LIB_VERSION)
+    set_target_properties(${lib} PROPERTIES SOVERSION ${VPP_LIB_VERSION})
+  endif()
 
   # library deps
   if(ARG_LINK_LIBRARIES)
@@ -33,7 +34,7 @@ macro(add_vpp_library lib)
   endif()
   install(
     TARGETS ${lib}
-    DESTINATION ${VPP_LIB_DIR_NAME}
+    DESTINATION lib
     COMPONENT ${ARG_COMPONENT}
   )
 
@@ -42,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
       )
@@ -64,7 +67,7 @@ macro(add_vpp_library lib)
       install(
 	FILES ${file}
 	DESTINATION include/${lib}/${dir}
-	COMPONENT vpp-dev
+	COMPONENT ${ARG_COMPONENT}-dev
       )
     endforeach()
   endif()