update

microsoft · Feb 26, 2025 · 63d7039 · 63d7039
1 parent 60427d4
commit 63d7039
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 116 deletions.
diff --git a/cmake/onnxruntime_flatbuffers.cmake b/cmake/onnxruntime_flatbuffers.cmake
@@ -8,7 +8,7 @@ file(GLOB onnxruntime_flatbuffers_srcs CONFIGURE_DEPENDS
 
 source_group(TREE ${REPO_ROOT} FILES ${onnxruntime_flatbuffers_srcs})
 
-onnxruntime_add_static_library(onnxruntime_flatbuffers ${onnxruntime_flatbuffers_srcs} ${ONNXRUNTIME_ROOT}/core/flatbuffers/schema/ort.fbs.h)
+onnxruntime_add_static_library(onnxruntime_flatbuffers ${onnxruntime_flatbuffers_srcs})
 onnxruntime_add_include_to_target(onnxruntime_flatbuffers onnx flatbuffers::flatbuffers ${GSL_TARGET})
 if(onnxruntime_ENABLE_INSTRUMENT)
   target_compile_definitions(onnxruntime_flatbuffers PUBLIC ONNXRUNTIME_ENABLE_INSTRUMENT)

diff --git a/cmake/onnxruntime_graph.cmake b/cmake/onnxruntime_graph.cmake
@@ -94,8 +94,11 @@ if (onnxruntime_ENABLE_TRAINING_OPS)
   list(REMOVE_ITEM orttraining_graph_src ${orttraining_graph_src_exclude})
 endif()
 
+add_library(onnxruntime_flatbuffers_generated INTERFACE ${ONNXRUNTIME_ROOT}/core/flatbuffers/schema/ort.fbs.h ${ONNXRUNTIME_ROOT}/lora/adapter_format/adapter_schema.fbs.h ${ONNXRUNTIME_ROOT}/test/flatbuffers/flatbuffers_utils_test.fbs.h)
+LIST(APPEND onnxruntime_EXTERNAL_DEPENDENCIES onnxruntime_flatbuffers_generated)
+
 onnxruntime_add_static_library(onnxruntime_graph ${onnxruntime_graph_src} ${orttraining_graph_src})
-add_dependencies(onnxruntime_graph onnx_proto flatbuffers::flatbuffers)
+add_dependencies(onnxruntime_graph ${onnxruntime_EXTERNAL_DEPENDENCIES})
 onnxruntime_add_include_to_target(onnxruntime_graph onnxruntime_common ${WIL_TARGET} onnx onnx_proto ${PROTOBUF_LIB} flatbuffers::flatbuffers safeint_interface Boost::mp11)
 
 if (MSVC)

diff --git a/cmake/onnxruntime_lora.cmake b/cmake/onnxruntime_lora.cmake
@@ -9,7 +9,7 @@ file(GLOB onnxruntime_lora_srcs CONFIGURE_DEPENDS
 
 source_group(TREE ${REPO_ROOT} FILES ${onnxruntime_lora_srcs})
 
-onnxruntime_add_static_library(onnxruntime_lora ${onnxruntime_lora_srcs} ${ONNXRUNTIME_ROOT}/lora/adapter_format/adapter_schema.fbs.h)
+onnxruntime_add_static_library(onnxruntime_lora ${onnxruntime_lora_srcs})
 onnxruntime_add_include_to_target(onnxruntime_lora onnx flatbuffers::flatbuffers Boost::mp11 ${GSL_TARGET})
 target_link_libraries(onnxruntime_lora onnxruntime_framework)
 

diff --git a/onnxruntime/test/flatbuffers/flatbuffers_utils_test.fbs.h b/onnxruntime/test/flatbuffers/flatbuffers_utils_test.fbs.h