aports/testing/onnxruntime/system.patch
2023-03-24 12:56:05 +01:00

46 lines
1.8 KiB
Diff

diff --git a/cmake/external/onnxruntime_external_deps.cmake b/cmake/external/onnxruntime_external_deps.cmake
index 0c41945..6bf4859 100644
--- a/cmake/external/onnxruntime_external_deps.cmake
+++ b/cmake/external/onnxruntime_external_deps.cmake
@@ -20,16 +20,16 @@ endforeach()
message("Loading Dependencies ...")
# ABSL should be included before protobuf because protobuf may use absl
if(NOT onnxruntime_DISABLE_ABSEIL)
- include(external/abseil-cpp.cmake)
+ find_package(absl REQUIRED)
+ set(ABSEIL_LIBS absl::inlined_vector absl::flat_hash_set
+ absl::flat_hash_map absl::node_hash_set absl::node_hash_map absl::base absl::throw_delegate absl::raw_hash_set
+ absl::hash absl::city absl::low_level_hash absl::raw_logging_internal)
endif()
+find_package(Protobuf REQUIRED)
+find_package(re2 REQUIRED)
+find_package(nlohmann_json REQUIRED)
set(RE2_BUILD_TESTING OFF CACHE BOOL "" FORCE)
-FetchContent_Declare(
- re2
- URL ${DEP_URL_re2}
- URL_HASH SHA1=${DEP_SHA1_re2}
- FIND_PACKAGE_ARGS NAMES re2
-)
if (onnxruntime_BUILD_UNIT_TESTS)
# WebAssembly threading support in Node.js is still an experimental feature and
@@ -126,7 +127,6 @@ if (onnxruntime_DISABLE_RTTI)
set(protobuf_DISABLE_RTTI ON CACHE BOOL "Remove runtime type information in the binaries" FORCE)
endif()
-include(protobuf_function)
#protobuf end
set(ENABLE_DATE_TESTING OFF CACHE BOOL "" FORCE)
@@ -263,7 +256,7 @@ FetchContent_Declare(
)
# The next line will generate an error message "fatal: not a git repository", but it is ok. It is from flatbuffers
-onnxruntime_fetchcontent_makeavailable(Protobuf nlohmann_json mp11 re2 safeint GSL flatbuffers)
+onnxruntime_fetchcontent_makeavailable(mp11 safeint GSL flatbuffers)
if(NOT flatbuffers_FOUND)
if(NOT TARGET flatbuffers::flatbuffers)
add_library(flatbuffers::flatbuffers ALIAS flatbuffers)