X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fcmake%2Fplugin.cmake;h=a5b4bf51a160ef522b7856d57c100651a19fe54c;hb=4c64b6edc86f7732f4a160b948b3386e4021a265;hp=e9397a7fa85cd7d7d9b2a258e8f95461eef1ad0c;hpb=d16004d56c22635a0e21b177933dc39b65a3642a;p=vpp.git

diff --git a/src/cmake/plugin.cmake b/src/cmake/plugin.cmake
index e9397a7fa85..a5b4bf51a16 100644
--- a/src/cmake/plugin.cmake
+++ b/src/cmake/plugin.cmake
@@ -20,9 +20,11 @@ macro(add_vpp_plugin name)
   )
   set(plugin_name ${name}_plugin)
   set(api_headers)
+  file(RELATIVE_PATH rpath ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
   foreach(f ${PLUGIN_API_FILES})
-     vpp_generate_api_header(${f} plugins)
-     list(APPEND api_headers ${f}.h ${f}.json)
+    vpp_generate_api_header(${f} plugins)
+    list(APPEND api_headers ${f}.h ${f}.json)
+    set_property(GLOBAL APPEND PROPERTY VPP_API_FILES ${rpath}/${f})
   endforeach()
   add_library(${plugin_name} SHARED ${PLUGIN_SOURCES} ${api_headers})
   add_dependencies(${plugin_name} vpp_version_h api_headers)
@@ -45,9 +47,9 @@ macro(add_vpp_plugin name)
     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 lib/vpp_api_test_plugins COMPONENT
+    install(TARGETS ${test_plugin_name} DESTINATION ${VPP_LIB_DIR_NAME}/vpp_api_test_plugins COMPONENT
 	    plugins)
   endif()
-  install(TARGETS ${plugin_name} DESTINATION lib/vpp_plugins COMPONENT plugins)
+  install(TARGETS ${plugin_name} DESTINATION ${VPP_LIB_DIR_NAME}/vpp_plugins COMPONENT plugins)
 endmacro()