X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fcmake%2Fplugin.cmake;h=9b0383f583d9a97ab16355f6a95a2b85f414fe36;hb=7d527a2292bdabc84ff070f5b27f35c0e858cddd;hp=c6f551dd3d56b5d89b3492c8342b3af236a9172a;hpb=833de8cab672c806176d580a1ebc001f394b2eaf;p=vpp.git

diff --git a/src/cmake/plugin.cmake b/src/cmake/plugin.cmake
index c6f551dd3d5..9b0383f583d 100644
--- a/src/cmake/plugin.cmake
+++ b/src/cmake/plugin.cmake
@@ -14,35 +14,57 @@
 macro(add_vpp_plugin name)
   cmake_parse_arguments(PLUGIN
     ""
-    "LINK_FLAGS;COMPONENT"
-    "SOURCES;API_FILES;MULTIARCH_SOURCES;LINK_LIBRARIES;INSTALL_HEADERS;API_TEST_SOURCES"
+    "LINK_FLAGS;COMPONENT;DEV_COMPONENT"
+    "SOURCES;API_FILES;MULTIARCH_SOURCES;LINK_LIBRARIES;INSTALL_HEADERS;API_TEST_SOURCES;"
     ${ARGN}
   )
   set(plugin_name ${name}_plugin)
-  set(api_headers)
+  set(api_includes)
   if(NOT PLUGIN_COMPONENT)
-    set(PLUGIN_COMPONENT vpp-plugin-misc)
+    set(PLUGIN_COMPONENT vpp-plugin-core)
   endif()
-  file(RELATIVE_PATH rpath ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
+  if(NOT PLUGIN_DEV_COMPONENT)
+    if(NOT VPP_EXTERNAL_PROJECT)
+      set(PLUGIN_DEV_COMPONENT vpp-dev)
+    else()
+      set(PLUGIN_DEV_COMPONENT ${PLUGIN_COMPONENT}-dev)
+    endif()
+  endif()
+
+  vpp_add_api_files(${plugin_name} plugins ${PLUGIN_COMPONENT} ${PLUGIN_API_FILES})
   foreach(f ${PLUGIN_API_FILES})
     get_filename_component(dir ${f} DIRECTORY)
-    vpp_generate_api_header(${f} plugins ${PLUGIN_COMPONENT})
-    list(APPEND api_headers ${f}.h ${f}.json)
-    set_property(GLOBAL APPEND PROPERTY VPP_API_FILES ${rpath}/${f})
+    list(APPEND api_includes ${f}.h ${f}_enum.h ${f}_types.h ${f}.json)
     install(
-      FILES ${CMAKE_CURRENT_BINARY_DIR}/${f}.h
+      FILES
+      ${CMAKE_CURRENT_BINARY_DIR}/${f}.h
+      ${CMAKE_CURRENT_BINARY_DIR}/${f}_enum.h
+      ${CMAKE_CURRENT_BINARY_DIR}/${f}_types.h
       DESTINATION include/vpp_plugins/${name}/${dir}
-      COMPONENT vpp-dev
+      COMPONENT ${PLUGIN_DEV_COMPONENT}
     )
   endforeach()
-  add_library(${plugin_name} SHARED ${PLUGIN_SOURCES} ${api_headers})
-  target_compile_options(${plugin_name} PRIVATE -Wall)
-  add_dependencies(${plugin_name} vpp_version_h api_headers)
+  add_library(${plugin_name} SHARED ${api_includes} ${PLUGIN_SOURCES})
+  set_target_properties(${plugin_name} PROPERTIES NO_SONAME 1)
+  target_compile_options(${plugin_name} PRIVATE "-fvisibility=hidden")
+  target_compile_options (${plugin_name} PRIVATE "-ffunction-sections")
+  target_compile_options (${plugin_name} PRIVATE "-fdata-sections")
+  target_link_libraries (${plugin_name} "-Wl,--gc-sections")
+  set(deps "")
+  if(NOT VPP_EXTERNAL_PROJECT)
+    list(APPEND deps vpp_version_h api_headers)
+  endif()
+  if(PLUGIN_API_FILES)
+    list(APPEND deps ${plugin_name}_api_headers)
+  endif()
+  if(deps)
+    add_dependencies(${plugin_name} ${deps})
+  endif()
   set_target_properties(${plugin_name} PROPERTIES
     PREFIX ""
     LIBRARY_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/vpp_plugins)
   if(PLUGIN_MULTIARCH_SOURCES)
-    vpp_library_set_multiarch_sources(${plugin_name} ${PLUGIN_MULTIARCH_SOURCES})
+    vpp_library_set_multiarch_sources(${plugin_name} SOURCES ${PLUGIN_MULTIARCH_SOURCES} DEPENDS ${deps})
   endif()
   if(PLUGIN_LINK_LIBRARIES)
     target_link_libraries(${plugin_name} ${PLUGIN_LINK_LIBRARIES})
@@ -62,21 +84,40 @@ macro(add_vpp_plugin name)
   endif()
   if(PLUGIN_API_TEST_SOURCES)
     set(test_plugin_name ${name}_test_plugin)
-    add_library(${test_plugin_name} SHARED ${PLUGIN_API_TEST_SOURCES} ${api_headers})
-    add_dependencies(${test_plugin_name} api_headers)
+    add_library(${test_plugin_name} SHARED ${PLUGIN_API_TEST_SOURCES}
+		${api_includes})
+    set_target_properties(${test_plugin_name} PROPERTIES NO_SONAME 1)
+    if(NOT VPP_EXTERNAL_PROJECT)
+      add_dependencies(${test_plugin_name} api_headers)
+    endif()
+    if(PLUGIN_API_FILES)
+      add_dependencies(${test_plugin_name} ${plugin_name}_api_headers)
+    endif()
     set_target_properties(${test_plugin_name} PROPERTIES
       PREFIX ""
       LIBRARY_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/vpp_api_test_plugins)
     install(
       TARGETS ${test_plugin_name}
-      DESTINATION ${VPP_LIB_DIR_NAME}/vpp_api_test_plugins
+      DESTINATION ${VPP_LIBRARY_DIR}/vpp_api_test_plugins
       COMPONENT ${PLUGIN_COMPONENT}
     )
   endif()
+  if (PLUGIN_API_FILES)
+    add_vpp_test_library(${name}_test_plugin ${PLUGIN_API_FILES})
+  endif()
+
   install(
     TARGETS ${plugin_name}
-    DESTINATION ${VPP_LIB_DIR_NAME}/vpp_plugins
+    DESTINATION ${VPP_LIBRARY_DIR}/vpp_plugins
     COMPONENT ${PLUGIN_COMPONENT}
   )
 endmacro()
 
+macro(vpp_plugin_find_library plugin var name)
+  find_library(${var} NAMES ${name} ${ARGN})
+if (NOT ${var})
+  message(WARNING "-- ${name} library not found - ${plugin} plugin disabled")
+  return()
+endif()
+    message(STATUS "${plugin} plugin needs ${name} library - found at ${${var}}")
+endmacro()