X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fcmake%2Fplugin.cmake;h=b399470db02c5cce375a367595ea3b4338c1faa6;hb=720820e64bf733fa0742fdf93da1e21b41db45c5;hp=aca90ab7fb606c74d1acdd123a8616f73ff3c35d;hpb=05bc31be20849e5994eb798d9eed0ad506a57d18;p=vpp.git

diff --git a/src/cmake/plugin.cmake b/src/cmake/plugin.cmake
index aca90ab7fb6..b399470db02 100644
--- a/src/cmake/plugin.cmake
+++ b/src/cmake/plugin.cmake
@@ -15,7 +15,7 @@ macro(add_vpp_plugin name)
   cmake_parse_arguments(PLUGIN
     ""
     "LINK_FLAGS;COMPONENT;DEV_COMPONENT"
-    "SOURCES;API_FILES;MULTIARCH_SOURCES;LINK_LIBRARIES;INSTALL_HEADERS;API_TEST_SOURCES;"
+    "SOURCES;API_FILES;MULTIARCH_SOURCES;MULTIARCH_FORCE_ON;LINK_LIBRARIES;INSTALL_HEADERS;API_TEST_SOURCES;"
     ${ARGN}
   )
   set(plugin_name ${name}_plugin)
@@ -34,28 +34,30 @@ macro(add_vpp_plugin name)
   vpp_add_api_files(${plugin_name} plugins ${PLUGIN_COMPONENT} ${PLUGIN_API_FILES})
   foreach(f ${PLUGIN_API_FILES})
     get_filename_component(dir ${f} DIRECTORY)
-    list(APPEND api_includes ${f}.h ${f}.json)
+    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 ${PLUGIN_DEV_COMPONENT}
     )
   endforeach()
-  add_library(${plugin_name} SHARED ${PLUGIN_SOURCES} ${api_includes})
+  add_library(${plugin_name} SHARED ${api_includes} ${PLUGIN_SOURCES})
+  target_compile_options(${plugin_name} PUBLIC ${VPP_DEFAULT_MARCH_FLAGS})
   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(PLUGIN_API_FILES)
-    list(APPEND deps ${plugin_name}_api_headers)
-  endif()
   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()
@@ -63,7 +65,11 @@ macro(add_vpp_plugin name)
     PREFIX ""
     LIBRARY_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/vpp_plugins)
   if(PLUGIN_MULTIARCH_SOURCES)
-    vpp_library_set_multiarch_sources(${plugin_name} "${deps}" ${PLUGIN_MULTIARCH_SOURCES})
+    vpp_library_set_multiarch_sources(${plugin_name}
+      SOURCES ${PLUGIN_MULTIARCH_SOURCES}
+      DEPENDS ${deps}
+      FORCE_ON ${PLUGIN_MULTIARCH_FORCE_ON}
+    )
   endif()
   if(PLUGIN_LINK_LIBRARIES)
     target_link_libraries(${plugin_name} ${PLUGIN_LINK_LIBRARIES})
@@ -85,13 +91,14 @@ macro(add_vpp_plugin name)
     set(test_plugin_name ${name}_test_plugin)
     add_library(${test_plugin_name} SHARED ${PLUGIN_API_TEST_SOURCES}
 		${api_includes})
+    target_compile_options(${test_plugin_name} PUBLIC ${VPP_DEFAULT_MARCH_FLAGS})
     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()
+    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)
@@ -114,6 +121,7 @@ endmacro()
 
 macro(vpp_plugin_find_library plugin var name)
   find_library(${var} NAMES ${name} ${ARGN})
+  mark_as_advanced(${var})
 if (NOT ${var})
   message(WARNING "-- ${name} library not found - ${plugin} plugin disabled")
   return()