X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fcmake%2Fplugin.cmake;h=1cff910db5f8d61afe9e7ba8488d7c9ed1bf4c9b;hb=2af0e3a;hp=c6f551dd3d56b5d89b3492c8342b3af236a9172a;hpb=833de8cab672c806176d580a1ebc001f394b2eaf;p=vpp.git

diff --git a/src/cmake/plugin.cmake b/src/cmake/plugin.cmake
index c6f551dd3d5..1cff910db5f 100644
--- a/src/cmake/plugin.cmake
+++ b/src/cmake/plugin.cmake
@@ -14,30 +14,40 @@
 macro(add_vpp_plugin name)
   cmake_parse_arguments(PLUGIN
     ""
-    "LINK_FLAGS;COMPONENT"
+    "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)
   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()
+
   file(RELATIVE_PATH rpath ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
   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)
+    list(APPEND api_includes ${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}
-      COMPONENT vpp-dev
+      COMPONENT ${PLUGIN_DEV_COMPONENT}
     )
   endforeach()
-  add_library(${plugin_name} SHARED ${PLUGIN_SOURCES} ${api_headers})
+  add_library(${plugin_name} SHARED ${PLUGIN_SOURCES} ${api_includes})
   target_compile_options(${plugin_name} PRIVATE -Wall)
-  add_dependencies(${plugin_name} vpp_version_h api_headers)
+  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)
@@ -62,20 +72,23 @@ 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})
+    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
+      DESTINATION lib/vpp_api_test_plugins
       COMPONENT ${PLUGIN_COMPONENT}
     )
   endif()
   install(
     TARGETS ${plugin_name}
-    DESTINATION ${VPP_LIB_DIR_NAME}/vpp_plugins
+    DESTINATION lib/vpp_plugins
     COMPONENT ${PLUGIN_COMPONENT}
   )
 endmacro()