summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMohsin Kazmi <sykazmi@cisco.com>2018-08-27 13:17:09 +0200
committerMohsin Kazmi <sykazmi@cisco.com>2018-08-27 16:28:04 +0200
commitb3abec7c1f936ee4950d14cc8a9c34c729551f9f (patch)
tree69963fbbad50cf4a06fa1943b2f6f8e4c9dd1207
parent2ba9dcf408d5f861738356dfb43c28a803fcd7fc (diff)
cmake: Fix VAPI .hpp generation
Change-Id: I2bec3b2511f00d017f9b3a727809631695222c1a Signed-off-by: Mohsin Kazmi <sykazmi@cisco.com>
-rw-r--r--src/vpp-api/vapi/CMakeLists.txt2
-rwxr-xr-xsrc/vpp-api/vapi/vapi_cpp_gen.py2
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 <vapi/vapi.hpp>")
- 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("")