X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fcmake%2Flibrary.cmake;h=3f17e30daab6dbcb650a98a4650b847deca3339c;hb=df87f8092;hp=b9e4f9b4bd8da032a14c48baa488084d4feede74;hpb=958192dc2abf427118a227d142f5b03807098cb2;p=vpp.git

diff --git a/src/cmake/library.cmake b/src/cmake/library.cmake
index b9e4f9b4bd8..3f17e30daab 100644
--- a/src/cmake/library.cmake
+++ b/src/cmake/library.cmake
@@ -13,14 +13,13 @@
 
 macro(add_vpp_library lib)
   cmake_parse_arguments(ARG
-    ""
+    "LTO"
     "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()
@@ -35,20 +34,31 @@ macro(add_vpp_library lib)
   endif()
   install(
     TARGETS ${lib}
-    DESTINATION lib
+    DESTINATION ${VPP_LIBRARY_DIR}
     COMPONENT ${ARG_COMPONENT}
   )
 
+  if (ARG_LTO AND VPP_USE_LTO)
+     set_property(TARGET ${lib} PROPERTY INTERPROCEDURAL_OPTIMIZATION TRUE)
+     target_compile_options (${lib} PRIVATE "-ffunction-sections")
+     target_compile_options (${lib} PRIVATE "-fdata-sections")
+     target_link_libraries (${lib} "-Wl,--gc-sections")
+  endif()
+
   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
+	${CMAKE_CURRENT_BINARY_DIR}/${file}_tojson.h
+	${CMAKE_CURRENT_BINARY_DIR}/${file}_fromjson.h
 	DESTINATION include/${lib}/${dir}
 	COMPONENT vpp-dev
       )
@@ -66,7 +76,7 @@ macro(add_vpp_library lib)
       install(
 	FILES ${file}
 	DESTINATION include/${lib}/${dir}
-	COMPONENT vpp-dev
+	COMPONENT ${ARG_COMPONENT}-dev
       )
     endforeach()
   endif()
@@ -85,3 +95,33 @@ function (add_vpp_headers path)
     )
   endforeach()
 endfunction()
+
+macro(add_vpp_test_library lib)
+  cmake_parse_arguments(TEST
+    ""
+    ""
+    ${ARGN}
+  )
+
+  foreach(file ${ARGN})
+    get_filename_component(name ${file} NAME_WE)
+    set(test_lib ${lib}_${name}_plugin)
+    add_library(${test_lib} SHARED ${file}_test2.c)
+    if(NOT VPP_EXTERNAL_PROJECT)
+      add_dependencies(${test_lib} api_headers)
+    endif()
+    include_directories(${CMAKE_CURRENT_BINARY_DIR})
+    set_target_properties(${test_lib} PROPERTIES NO_SONAME 1)
+    set_target_properties(${test_lib} PROPERTIES
+      PREFIX ""
+      LIBRARY_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/vat2_plugins)
+
+    # Later: Install and package
+    # install .so
+    #install(
+    #  TARGETS ${test_lib}
+    #  DESTINATION ${VPP_LIBRARY_DIR}/vat2_plugins
+    #  #COMPONENT ${ARG_COMPONENT}
+    #  )
+  endforeach()
+endmacro()