ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: add FORCE_ON option for multiarch variants

Browse Source 
Type: make
Change-Id: I37fb925a9cc2dfc21dd7874f4b20a6943b28efc8
Signed-off-by: Damjan Marion <damarion@cisco.com>
This commit is contained in:
Damjan Marion
2021-05-06 20:48:34 +02:00
committed by Florin Coras
parent f4d338f0b4
commit 312fb4dbdf
3 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/cmake/cpu.cmake
View File

@ -107,6 +107,8 @@ macro(add_vpp_march_variant v)
endif() endif()
if (VPP_MARCH_VARIANT_${uv}) if (VPP_MARCH_VARIANT_${uv})
list(APPEND MARCH_VARIANTS "${v}\;${fs}") list(APPEND MARCH_VARIANTS "${v}\;${fs}")
else()
list(APPEND MARCH_VARIANTS_DISABLED "${v}\;${fs}")
endif() endif()
endif() endif()
endif() endif()
@ -169,11 +171,25 @@ macro(vpp_library_set_multiarch_sources lib)
cmake_parse_arguments(ARG cmake_parse_arguments(ARG
"" ""
"" ""
"SOURCES;DEPENDS" "SOURCES;DEPENDS;FORCE_ON"
${ARGN} ${ARGN}
) )
foreach(V ${MARCH_VARIANTS}) set(VARIANTS "${MARCH_VARIANTS}")
if(ARG_FORCE_ON)
foreach(F ${ARG_FORCE_ON})
foreach(V ${MARCH_VARIANTS_DISABLED})
list(GET V 0 VARIANT)
if (VARIANT STREQUAL F)
list(GET V 1 VARIANT_FLAGS)
list(APPEND VARIANTS "${VARIANT}\;${VARIANT_FLAGS}")
endif()
endforeach()
endforeach()
endif()
foreach(V ${VARIANTS})
list(GET V 0 VARIANT) list(GET V 0 VARIANT)
list(GET V 1 VARIANT_FLAGS) list(GET V 1 VARIANT_FLAGS)
set(l ${lib}_${VARIANT}) set(l ${lib}_${VARIANT})

8
src/cmake/plugin.cmake
View File

@ -15,7 +15,7 @@ macro(add_vpp_plugin name)
cmake_parse_arguments(PLUGIN cmake_parse_arguments(PLUGIN
"" ""
"LINK_FLAGS;COMPONENT;DEV_COMPONENT" "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} ${ARGN}
) )
set(plugin_name ${name}_plugin) set(plugin_name ${name}_plugin)
@ -64,7 +64,11 @@ macro(add_vpp_plugin name)
PREFIX "" PREFIX ""
LIBRARY_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/vpp_plugins) LIBRARY_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/vpp_plugins)
if(PLUGIN_MULTIARCH_SOURCES) if(PLUGIN_MULTIARCH_SOURCES)
vpp_library_set_multiarch_sources(${plugin_name} SOURCES ${PLUGIN_MULTIARCH_SOURCES} DEPENDS ${deps}) vpp_library_set_multiarch_sources(${plugin_name}
SOURCES ${PLUGIN_MULTIARCH_SOURCES}
DEPENDS ${deps}
FORCE_ON ${PLUGIN_MULTIARCH_FORCE_ON}
)
endif() endif()
if(PLUGIN_LINK_LIBRARIES) if(PLUGIN_LINK_LIBRARIES)
target_link_libraries(${plugin_name} ${PLUGIN_LINK_LIBRARIES}) target_link_libraries(${plugin_name} ${PLUGIN_LINK_LIBRARIES})

2
src/plugins/avf/CMakeLists.txt
View File

@ -27,6 +27,8 @@ add_vpp_plugin(avf
input.c input.c
output.c output.c
MULTIARCH_FORCE_ON trm
API_FILES API_FILES
avf.api avf.api