Skip to content

Commit

Permalink
[infra] Use variable for flatc path (#8456)
Browse files Browse the repository at this point in the history
This will revise to use variable for flatc path.

ONE-DCO-1.0-Signed-off-by: SaeHie Park <[email protected]>
  • Loading branch information
seanshpark authored Feb 22, 2022
1 parent 9c0e052 commit 942e59a
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
6 changes: 4 additions & 2 deletions infra/cmake/packages/FlatBuffers-1.10/FlatBuffersConfig.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ endfunction(_FlatBuffers_build)
_FlatBuffers_build()
_FlatBuffers_import()

set(FLATC_PATH "$<TARGET_FILE:flatbuffers::flatc>")

if(FlatBuffers_FOUND)
if(NOT TARGET flatbuffers-1.10)
add_library(flatbuffers-1.10 INTERFACE)
Expand All @@ -60,7 +62,7 @@ if(FlatBuffers_FOUND)

add_custom_command(OUTPUT ${OUTPUT_FILES}
COMMAND ${CMAKE_COMMAND} -E make_directory "${abs_output_dir}"
COMMAND "$<TARGET_FILE:flatbuffers::flatc>" -c --no-includes
COMMAND "${FLATC_PATH}" -c --no-includes
--no-union-value-namespacing
--gen-object-api -o "${abs_output_dir}"
${SCHEMA_FILES}
Expand Down Expand Up @@ -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 "$<TARGET_FILE:flatbuffers::flatc>" -c --no-includes
COMMAND "${FLATC_PATH}" -c --no-includes
--no-union-value-namespacing
--gen-object-api -o "${abs_output_dir}"
${SCHEMA_FILES}
Expand Down
6 changes: 4 additions & 2 deletions infra/cmake/packages/FlatBuffers-1.12/FlatBuffersConfig.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ endfunction(_FlatBuffers_build)
_FlatBuffers_build()
_FlatBuffers_import()

set(FLATC_PATH "$<TARGET_FILE:flatbuffers::flatc>")

if(FlatBuffers_FOUND)
if(NOT TARGET flatbuffers-1.12)
add_library(flatbuffers-1.12 INTERFACE)
Expand All @@ -60,7 +62,7 @@ if(FlatBuffers_FOUND)

add_custom_command(OUTPUT ${OUTPUT_FILES}
COMMAND ${CMAKE_COMMAND} -E make_directory "${abs_output_dir}"
COMMAND "$<TARGET_FILE:flatbuffers::flatc>" -c --no-includes
COMMAND "${FLATC_PATH}" -c --no-includes
--no-union-value-namespacing
--gen-object-api -o "${abs_output_dir}"
${SCHEMA_FILES}
Expand Down Expand Up @@ -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 "$<TARGET_FILE:flatbuffers::flatc>" -c --no-includes
COMMAND "${FLATC_PATH}" -c --no-includes
--no-union-value-namespacing
--gen-object-api -o "${abs_output_dir}"
${SCHEMA_FILES}
Expand Down

0 comments on commit 942e59a

Please sign in to comment.