From 6ceee457ddd145263df14defe72a5d1d2bc293e9 Mon Sep 17 00:00:00 2001 From: Benoît Ganne Date: Thu, 25 Jul 2019 17:15:59 +0200 Subject: build: vppapigen search VPP_INCLUDE_DIR if set MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When building out-of-tree plugins, we must search for .api in VPP installed include directory. Type: fix Change-Id: I76b7bace69ff54a385d944313879e2aeb7293648 Signed-off-by: Benoît Ganne --- src/cmake/api.cmake | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'src/cmake/api.cmake') diff --git a/src/cmake/api.cmake b/src/cmake/api.cmake index dac2a7d3113..693c55d86b7 100644 --- a/src/cmake/api.cmake +++ b/src/cmake/api.cmake @@ -20,10 +20,13 @@ function(vpp_generate_api_c_header file) if(NOT VPP_APIGEN) set(VPP_APIGEN ${CMAKE_SOURCE_DIR}/tools/vppapigen/vppapigen) endif() + if (VPP_INCLUDE_DIR) + set(includedir "--includedir" ${VPP_INCLUDE_DIR}) + endif() add_custom_command (OUTPUT ${output_name} COMMAND mkdir -p ${output_dir} COMMAND ${VPP_APIGEN} - ARGS --includedir ${CMAKE_SOURCE_DIR} --input ${CMAKE_CURRENT_SOURCE_DIR}/${file} --output ${output_name} + ARGS ${includedir} --includedir ${CMAKE_SOURCE_DIR} --input ${CMAKE_CURRENT_SOURCE_DIR}/${file} --output ${output_name} DEPENDS ${VPP_APIGEN} ${CMAKE_CURRENT_SOURCE_DIR}/${file} COMMENT "Generating API header ${output_name}" ) @@ -35,10 +38,13 @@ function(vpp_generate_api_json_header file dir component) if(NOT VPP_APIGEN) set(VPP_APIGEN ${CMAKE_SOURCE_DIR}/tools/vppapigen/vppapigen) endif() + if (VPP_INCLUDE_DIR) + set(includedir "--includedir" ${VPP_INCLUDE_DIR}) + endif() add_custom_command (OUTPUT ${output_name} COMMAND mkdir -p ${output_dir} COMMAND ${VPP_APIGEN} - ARGS --includedir ${CMAKE_SOURCE_DIR} --input ${CMAKE_CURRENT_SOURCE_DIR}/${file} JSON --output ${output_name} + ARGS ${includedir} --includedir ${CMAKE_SOURCE_DIR} --input ${CMAKE_CURRENT_SOURCE_DIR}/${file} JSON --output ${output_name} DEPENDS ${VPP_APIGEN} ${CMAKE_CURRENT_SOURCE_DIR}/${file} COMMENT "Generating API header ${output_name}" ) -- cgit 1.2.3-korg