Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Rename VPP_TEST_FAILED_DIR to FAILED_DIR
[vpp.git]
/
src
/
cmake
/
api.cmake
diff --git
a/src/cmake/api.cmake
b/src/cmake/api.cmake
index
644e80b
..
dac2a7d
100644
(file)
--- a/
src/cmake/api.cmake
+++ b/
src/cmake/api.cmake
@@
-17,26
+17,36
@@
function(vpp_generate_api_c_header file)
set (output_name ${CMAKE_CURRENT_BINARY_DIR}/${file}.h)
get_filename_component(output_dir ${output_name} DIRECTORY)
function(vpp_generate_api_c_header file)
set (output_name ${CMAKE_CURRENT_BINARY_DIR}/${file}.h)
get_filename_component(output_dir ${output_name} DIRECTORY)
+ if(NOT VPP_APIGEN)
+ set(VPP_APIGEN ${CMAKE_SOURCE_DIR}/tools/vppapigen/vppapigen)
+ endif()
add_custom_command (OUTPUT ${output_name}
COMMAND mkdir -p ${output_dir}
add_custom_command (OUTPUT ${output_name}
COMMAND mkdir -p ${output_dir}
- COMMAND ${
CMAKE_SOURCE_DIR}/tools/vppapigen/vppapigen
+ COMMAND ${
VPP_APIGEN}
ARGS --includedir ${CMAKE_SOURCE_DIR} --input ${CMAKE_CURRENT_SOURCE_DIR}/${file} --output ${output_name}
ARGS --includedir ${CMAKE_SOURCE_DIR} --input ${CMAKE_CURRENT_SOURCE_DIR}/${file} --output ${output_name}
- DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${file}
+ DEPENDS ${
VPP_APIGEN} ${
CMAKE_CURRENT_SOURCE_DIR}/${file}
COMMENT "Generating API header ${output_name}"
)
endfunction()
COMMENT "Generating API header ${output_name}"
)
endfunction()
-function(vpp_generate_api_json_header file dir)
+function(vpp_generate_api_json_header file dir
component
)
set (output_name ${CMAKE_CURRENT_BINARY_DIR}/${file}.json)
get_filename_component(output_dir ${output_name} DIRECTORY)
set (output_name ${CMAKE_CURRENT_BINARY_DIR}/${file}.json)
get_filename_component(output_dir ${output_name} DIRECTORY)
+ if(NOT VPP_APIGEN)
+ set(VPP_APIGEN ${CMAKE_SOURCE_DIR}/tools/vppapigen/vppapigen)
+ endif()
add_custom_command (OUTPUT ${output_name}
COMMAND mkdir -p ${output_dir}
add_custom_command (OUTPUT ${output_name}
COMMAND mkdir -p ${output_dir}
- COMMAND ${
CMAKE_SOURCE_DIR}/tools/vppapigen/vppapigen
+ COMMAND ${
VPP_APIGEN}
ARGS --includedir ${CMAKE_SOURCE_DIR} --input ${CMAKE_CURRENT_SOURCE_DIR}/${file} JSON --output ${output_name}
ARGS --includedir ${CMAKE_SOURCE_DIR} --input ${CMAKE_CURRENT_SOURCE_DIR}/${file} JSON --output ${output_name}
- DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${file}
+ DEPENDS ${
VPP_APIGEN} ${
CMAKE_CURRENT_SOURCE_DIR}/${file}
COMMENT "Generating API header ${output_name}"
)
COMMENT "Generating API header ${output_name}"
)
- install(FILES ${output_name} DESTINATION share/vpp/api/${dir}/)
+ install(
+ FILES ${output_name}
+ DESTINATION share/vpp/api/${dir}/
+ COMPONENT ${component}
+ )
endfunction()
##############################################################################
endfunction()
##############################################################################
@@
-45,16
+55,19
@@
endfunction()
# @param dir - the install directory under ROOT/share/vpp/api to place the
# generated .json file
##############################################################################
# @param dir - the install directory under ROOT/share/vpp/api to place the
# generated .json file
##############################################################################
-function(vpp_generate_api_header file dir)
+function(vpp_generate_api_header file dir
component
)
vpp_generate_api_c_header (${file})
vpp_generate_api_c_header (${file})
- vpp_generate_api_json_header (${file} ${dir})
+ vpp_generate_api_json_header (${file} ${dir}
${component}
)
endfunction()
endfunction()
-function(vpp_add_api_files
target
)
+function(vpp_add_api_files
name
)
unset(header_files)
unset(header_files)
+ set(target ${name}_api_headers)
+ file(RELATIVE_PATH rpath ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
foreach(file ${ARGN})
foreach(file ${ARGN})
- vpp_generate_api_header (${file} core)
- list (APPEND header_files ${file}.h ${file}.json)
+ vpp_generate_api_header (${file} core vpp)
+ list(APPEND header_files ${file}.h ${file}.json)
+ set_property(GLOBAL APPEND PROPERTY VPP_API_FILES ${rpath}/${file})
endforeach()
add_custom_target(${target} DEPENDS ${header_files})
endfunction()
endforeach()
add_custom_target(${target} DEPENDS ${header_files})
endfunction()