From b3abec7c1f936ee4950d14cc8a9c34c729551f9f Mon Sep 17 00:00:00 2001 From: Mohsin Kazmi Date: Mon, 27 Aug 2018 13:17:09 +0200 Subject: [PATCH 1/1] cmake: Fix VAPI .hpp generation Change-Id: I2bec3b2511f00d017f9b3a727809631695222c1a Signed-off-by: Mohsin Kazmi --- src/vpp-api/vapi/CMakeLists.txt | 2 +- src/vpp-api/vapi/vapi_cpp_gen.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vpp-api/vapi/CMakeLists.txt b/src/vpp-api/vapi/CMakeLists.txt index 103e7c50d16..0aff8827017 100644 --- a/src/vpp-api/vapi/CMakeLists.txt +++ b/src/vpp-api/vapi/CMakeLists.txt @@ -42,7 +42,7 @@ foreach(f ${VPP_API_FILES}) OUTPUT ${output} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/vapi_cpp_gen.py - ARGS --remove-path ${input} + ARGS --gen-h-prefix=vapi --remove-path ${input} DEPENDS ${input} vapi_cpp_gen.py vapi_json_parser.py COMMENT "Generating VAPI C++ header ${output}" ) diff --git a/src/vpp-api/vapi/vapi_cpp_gen.py b/src/vpp-api/vapi/vapi_cpp_gen.py index adf85c753d8..326026837fd 100755 --- a/src/vpp-api/vapi/vapi_cpp_gen.py +++ b/src/vpp-api/vapi/vapi_cpp_gen.py @@ -136,7 +136,7 @@ def gen_json_header(parser, logger, j, io, gen_h_prefix, add_debug_comments): print("#define %s" % include_guard) print("") print("#include ") - print("#include <%s%s>" % (gen_h_prefix, json_to_c_header_name(j))) + print("#include <%s%s>" % (gen_h_prefix, json_to_c_header_name(f))) print("") print("namespace vapi {") print("") -- 2.16.6