vrrp: asynchronous events on VR state change

[vpp.git] / src / cmake / plugin.cmake

diff --git a/src/cmake/plugin.cmake b/src/cmake/plugin.cmake
index 1565170..516588c 100644 (file)
--- a/src/cmake/plugin.cmake
+++ b/src/cmake/plugin.cmake
@@ -31,29 +31,34 @@ macro(add_vpp_plugin name)
     endif()
   endif()
 
-  file(RELATIVE_PATH rpath ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
+  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_includes ${f}.h ${f}.json)
-    set_property(GLOBAL APPEND PROPERTY VPP_API_FILES ${rpath}/${f})
     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_includes})
   set_target_properties(${plugin_name} PROPERTIES NO_SONAME 1)
-  target_compile_options(${plugin_name} PRIVATE -Wall)
+  target_compile_options(${plugin_name} PRIVATE "-fvisibility=hidden")
+  set(deps "")
+  if(PLUGIN_API_FILES)
+    list(APPEND deps ${plugin_name}_api_headers)
+  endif()
   if(NOT VPP_EXTERNAL_PROJECT)
-    add_dependencies(${plugin_name} vpp_version_h api_headers)
+    list(APPEND deps vpp_version_h api_headers)
   endif()
+  add_dependencies(${plugin_name} ${deps})
   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} "${deps}" ${PLUGIN_MULTIARCH_SOURCES})
   endif()
   if(PLUGIN_LINK_LIBRARIES)
     target_link_libraries(${plugin_name} ${PLUGIN_LINK_LIBRARIES})
@@ -76,6 +81,9 @@ macro(add_vpp_plugin name)
     add_library(${test_plugin_name} SHARED ${PLUGIN_API_TEST_SOURCES}
                ${api_includes})
     set_target_properties(${test_plugin_name} PROPERTIES NO_SONAME 1)
+    if(PLUGIN_API_FILES)
+      add_dependencies(${test_plugin_name} ${plugin_name}_api_headers)
+    endif()
     if(NOT VPP_EXTERNAL_PROJECT)
       add_dependencies(${test_plugin_name} api_headers)
     endif()
@@ -84,13 +92,13 @@ macro(add_vpp_plugin name)
       LIBRARY_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/vpp_api_test_plugins)
     install(
       TARGETS ${test_plugin_name}
-      DESTINATION lib/vpp_api_test_plugins
+      DESTINATION ${VPP_LIBRARY_DIR}/vpp_api_test_plugins
       COMPONENT ${PLUGIN_COMPONENT}
     )
   endif()
   install(
     TARGETS ${plugin_name}
-    DESTINATION lib/vpp_plugins
+    DESTINATION ${VPP_LIBRARY_DIR}/vpp_plugins
     COMPONENT ${PLUGIN_COMPONENT}
   )
 endmacro()