ip: Move the IP6 fib into ip6_[m]fib.c

[vpp.git] / src / cmake / library.cmake

diff --git a/src/cmake/library.cmake b/src/cmake/library.cmake
index b9e4f9b..06248a5 100644 (file)
--- a/src/cmake/library.cmake
+++ b/src/cmake/library.cmake
@@ -20,7 +20,6 @@ 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()
@@ -35,20 +34,22 @@ macro(add_vpp_library lib)
   endif()
   install(
     TARGETS ${lib}
-    DESTINATION lib
+    DESTINATION ${VPP_LIBRARY_DIR}
     COMPONENT ${ARG_COMPONENT}
   )
 
   if(ARG_MULTIARCH_SOURCES)
-    vpp_library_set_multiarch_sources(${lib} ${ARG_MULTIARCH_SOURCES})
+    vpp_library_set_multiarch_sources(${lib} "${ARG_DEPENDS}" ${ARG_MULTIARCH_SOURCES})
   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
       )
@@ -66,7 +67,7 @@ macro(add_vpp_library lib)
       install(
        FILES ${file}
        DESTINATION include/${lib}/${dir}
-       COMPONENT vpp-dev
+       COMPONENT ${ARG_COMPONENT}-dev
       )
     endforeach()
   endif()