X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fcmake%2Fplugin.cmake;h=2e2749a440e34e2f0ed81e7b34cf64024dc7e22c;hb=dc20371f83ed81462c0b24eb750b76f7819df64a;hp=6cae5e06ab4768e7a58a1faa696a6a926a5d9b42;hpb=f8520159d5e5b4988f56919d34aae3ee7ce38cdb;p=vpp.git

diff --git a/src/cmake/plugin.cmake b/src/cmake/plugin.cmake
index 6cae5e06ab4..2e2749a440e 100644
--- a/src/cmake/plugin.cmake
+++ b/src/cmake/plugin.cmake
@@ -14,23 +14,43 @@
 macro(add_vpp_plugin name)
   cmake_parse_arguments(PLUGIN
     ""
-    "LINK_FLAGS"
+    "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)
-  file(RELATIVE_PATH rpath ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
+  set(api_includes)
+  if(NOT PLUGIN_COMPONENT)
+    set(PLUGIN_COMPONENT vpp-plugin-core)
+  endif()
+  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)
-    list(APPEND api_headers ${f}.h ${f}.json)
-    set_property(GLOBAL APPEND PROPERTY VPP_API_FILES ${rpath}/${f})
-    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${f}.h DESTINATION
-      include/vpp_plugins/${name}/${dir})
+    list(APPEND api_includes ${f}.h ${f}.json)
+    install(
+      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 ${PLUGIN_DEV_COMPONENT}
+    )
   endforeach()
-  add_library(${plugin_name} SHARED ${PLUGIN_SOURCES} ${api_headers})
-  add_dependencies(${plugin_name} vpp_version_h api_headers)
+  add_library(${plugin_name} SHARED ${PLUGIN_SOURCES} ${api_includes})
+  set_target_properties(${plugin_name} PROPERTIES NO_SONAME 1)
+  if(PLUGIN_API_FILES)
+    add_dependencies(${plugin_name} ${plugin_name}_api_headers)
+  endif()
+  if(NOT VPP_EXTERNAL_PROJECT)
+    add_dependencies(${plugin_name} vpp_version_h api_headers)
+  endif()
   set_target_properties(${plugin_name} PROPERTIES
     PREFIX ""
     LIBRARY_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/vpp_plugins)
@@ -46,19 +66,42 @@ macro(add_vpp_plugin name)
   if(PLUGIN_INSTALL_HEADERS)
     foreach(file ${PLUGIN_INSTALL_HEADERS})
       get_filename_component(dir ${file} DIRECTORY)
-      install(FILES ${file} DESTINATION include/vpp_plugins/${name}/${dir})
+      install(
+	FILES ${file}
+	DESTINATION include/vpp_plugins/${name}/${dir}
+	COMPONENT vpp-dev
+      )
     endforeach()
   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()
     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 COMPONENT
-	    plugins)
+    install(
+      TARGETS ${test_plugin_name}
+      DESTINATION lib/vpp_api_test_plugins
+      COMPONENT ${PLUGIN_COMPONENT}
+    )
   endif()
-  install(TARGETS ${plugin_name} DESTINATION ${VPP_LIB_DIR_NAME}/vpp_plugins COMPONENT plugins)
+  install(
+    TARGETS ${plugin_name}
+    DESTINATION lib/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()