summaryrefslogtreecommitdiffstats
path: root/src/cmake
diff options
context:
space:
mode:
Diffstat (limited to 'src/cmake')
-rw-r--r--src/cmake/api.cmake21
-rw-r--r--src/cmake/library.cmake32
-rw-r--r--src/cmake/plugin.cmake6
3 files changed, 57 insertions, 2 deletions
diff --git a/src/cmake/api.cmake b/src/cmake/api.cmake
index fe2cad6bc46..f3af68748d6 100644
--- a/src/cmake/api.cmake
+++ b/src/cmake/api.cmake
@@ -23,13 +23,32 @@ function(vpp_generate_api_c_header file)
if (VPP_INCLUDE_DIR)
set(includedir "--includedir" ${VPP_INCLUDE_DIR})
endif()
- add_custom_command (OUTPUT ${output_name}
+
+ set(OUTPUT_HEADERS
+ "${CMAKE_CURRENT_BINARY_DIR}/${file}.h"
+ "${CMAKE_CURRENT_BINARY_DIR}/${file}_fromjson.h"
+ "${CMAKE_CURRENT_BINARY_DIR}/${file}_tojson.h"
+ "${CMAKE_CURRENT_BINARY_DIR}/${file}_enum.h"
+ "${CMAKE_CURRENT_BINARY_DIR}/${file}_types.h"
+ "${CMAKE_CURRENT_BINARY_DIR}/${file}.c"
+ "${CMAKE_CURRENT_BINARY_DIR}/${file}_test.c"
+ "${CMAKE_CURRENT_BINARY_DIR}/${file}_test2.c"
+ )
+
+ add_custom_command (
+ OUTPUT ${OUTPUT_HEADERS}
COMMAND mkdir -p ${output_dir}
COMMAND ${VPP_APIGEN}
ARGS ${includedir} --includedir ${CMAKE_SOURCE_DIR} --input ${CMAKE_CURRENT_SOURCE_DIR}/${file} --outputdir ${output_dir} --output ${output_name}
DEPENDS ${VPP_APIGEN} ${CMAKE_CURRENT_SOURCE_DIR}/${file}
COMMENT "Generating API header ${output_name}"
)
+ get_filename_component(barename ${file} NAME)
+ set(t ${barename}_deps)
+ if (NOT TARGET ${t})
+ add_custom_target(${t} ALL DEPENDS ${OUTPUT_HEADERS})
+ add_dependencies(api_headers ${t})
+ endif()
endfunction()
function(vpp_generate_api_json_header file dir component)
diff --git a/src/cmake/library.cmake b/src/cmake/library.cmake
index a5b6c76d2d1..3f17e30daab 100644
--- a/src/cmake/library.cmake
+++ b/src/cmake/library.cmake
@@ -57,6 +57,8 @@ macro(add_vpp_library lib)
FILES ${file} ${CMAKE_CURRENT_BINARY_DIR}/${file}.h
${CMAKE_CURRENT_BINARY_DIR}/${file}_enum.h
${CMAKE_CURRENT_BINARY_DIR}/${file}_types.h
+ ${CMAKE_CURRENT_BINARY_DIR}/${file}_tojson.h
+ ${CMAKE_CURRENT_BINARY_DIR}/${file}_fromjson.h
DESTINATION include/${lib}/${dir}
COMPONENT vpp-dev
)
@@ -93,3 +95,33 @@ function (add_vpp_headers path)
)
endforeach()
endfunction()
+
+macro(add_vpp_test_library lib)
+ cmake_parse_arguments(TEST
+ ""
+ ""
+ ${ARGN}
+ )
+
+ foreach(file ${ARGN})
+ get_filename_component(name ${file} NAME_WE)
+ set(test_lib ${lib}_${name}_plugin)
+ add_library(${test_lib} SHARED ${file}_test2.c)
+ if(NOT VPP_EXTERNAL_PROJECT)
+ add_dependencies(${test_lib} api_headers)
+ endif()
+ include_directories(${CMAKE_CURRENT_BINARY_DIR})
+ set_target_properties(${test_lib} PROPERTIES NO_SONAME 1)
+ set_target_properties(${test_lib} PROPERTIES
+ PREFIX ""
+ LIBRARY_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/vat2_plugins)
+
+ # Later: Install and package
+ # install .so
+ #install(
+ # TARGETS ${test_lib}
+ # DESTINATION ${VPP_LIBRARY_DIR}/vat2_plugins
+ # #COMPONENT ${ARG_COMPONENT}
+ # )
+ endforeach()
+endmacro()
diff --git a/src/cmake/plugin.cmake b/src/cmake/plugin.cmake
index 2aae89510c1..c165b5914dc 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;LINK_LIBRARIES;INSTALL_HEADERS;API_TEST_SOURCES;"
${ARGN}
)
set(plugin_name ${name}_plugin)
@@ -99,6 +99,10 @@ macro(add_vpp_plugin name)
COMPONENT ${PLUGIN_COMPONENT}
)
endif()
+ if (PLUGIN_API_FILES)
+ add_vpp_test_library(${name}_test_plugin ${PLUGIN_API_FILES})
+ endif()
+
install(
TARGETS ${plugin_name}
DESTINATION ${VPP_LIBRARY_DIR}/vpp_plugins