From 942e59ac8287d60060ee4558abfff23c8d2272e9 Mon Sep 17 00:00:00 2001 From: SaeHie Park Date: Tue, 22 Feb 2022 11:10:19 +0900 Subject: [PATCH] [infra] Use variable for flatc path (#8456) This will revise to use variable for flatc path. ONE-DCO-1.0-Signed-off-by: SaeHie Park --- .../cmake/packages/FlatBuffers-1.10/FlatBuffersConfig.cmake | 6 ++++-- .../cmake/packages/FlatBuffers-1.12/FlatBuffersConfig.cmake | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/infra/cmake/packages/FlatBuffers-1.10/FlatBuffersConfig.cmake b/infra/cmake/packages/FlatBuffers-1.10/FlatBuffersConfig.cmake index 8b0a602cb21..07f526cc341 100644 --- a/infra/cmake/packages/FlatBuffers-1.10/FlatBuffersConfig.cmake +++ b/infra/cmake/packages/FlatBuffers-1.10/FlatBuffersConfig.cmake @@ -37,6 +37,8 @@ endfunction(_FlatBuffers_build) _FlatBuffers_build() _FlatBuffers_import() +set(FLATC_PATH "$") + if(FlatBuffers_FOUND) if(NOT TARGET flatbuffers-1.10) add_library(flatbuffers-1.10 INTERFACE) @@ -60,7 +62,7 @@ if(FlatBuffers_FOUND) add_custom_command(OUTPUT ${OUTPUT_FILES} COMMAND ${CMAKE_COMMAND} -E make_directory "${abs_output_dir}" - COMMAND "$" -c --no-includes + COMMAND "${FLATC_PATH}" -c --no-includes --no-union-value-namespacing --gen-object-api -o "${abs_output_dir}" ${SCHEMA_FILES} @@ -102,7 +104,7 @@ if(FlatBuffers_FOUND) # Generate headers add_custom_command(OUTPUT ${OUTPUT_FILES} COMMAND ${CMAKE_COMMAND} -E make_directory "${abs_output_dir}" - COMMAND "$" -c --no-includes + COMMAND "${FLATC_PATH}" -c --no-includes --no-union-value-namespacing --gen-object-api -o "${abs_output_dir}" ${SCHEMA_FILES} diff --git a/infra/cmake/packages/FlatBuffers-1.12/FlatBuffersConfig.cmake b/infra/cmake/packages/FlatBuffers-1.12/FlatBuffersConfig.cmake index 06366db63d8..f1af86819f3 100644 --- a/infra/cmake/packages/FlatBuffers-1.12/FlatBuffersConfig.cmake +++ b/infra/cmake/packages/FlatBuffers-1.12/FlatBuffersConfig.cmake @@ -37,6 +37,8 @@ endfunction(_FlatBuffers_build) _FlatBuffers_build() _FlatBuffers_import() +set(FLATC_PATH "$") + if(FlatBuffers_FOUND) if(NOT TARGET flatbuffers-1.12) add_library(flatbuffers-1.12 INTERFACE) @@ -60,7 +62,7 @@ if(FlatBuffers_FOUND) add_custom_command(OUTPUT ${OUTPUT_FILES} COMMAND ${CMAKE_COMMAND} -E make_directory "${abs_output_dir}" - COMMAND "$" -c --no-includes + COMMAND "${FLATC_PATH}" -c --no-includes --no-union-value-namespacing --gen-object-api -o "${abs_output_dir}" ${SCHEMA_FILES} @@ -102,7 +104,7 @@ if(FlatBuffers_FOUND) # Generate headers add_custom_command(OUTPUT ${OUTPUT_FILES} COMMAND ${CMAKE_COMMAND} -E make_directory "${abs_output_dir}" - COMMAND "$" -c --no-includes + COMMAND "${FLATC_PATH}" -c --no-includes --no-union-value-namespacing --gen-object-api -o "${abs_output_dir}" ${SCHEMA_FILES}