diff --git a/recipes/onnxruntime/all/conanfile.py b/recipes/onnxruntime/all/conanfile.py index 5e9a546d841c5b..ffd1f73fe14525 100644 --- a/recipes/onnxruntime/all/conanfile.py +++ b/recipes/onnxruntime/all/conanfile.py @@ -110,7 +110,7 @@ def source(self): def generate(self): tc = CMakeToolchain(self) # disable downloading dependencies to ensure conan ones are used - # tc.variables["FETCHCONTENT_FULLY_DISCONNECTED"] = True + tc.variables["FETCHCONTENT_FULLY_DISCONNECTED"] = True tc.variables["onnxruntime_USE_FULL_PROTOBUF"] = True tc.variables["onnxruntime_BUILD_UNIT_TESTS"] = False diff --git a/recipes/onnxruntime/all/patches/1.14.1-0001-cmake-dependencies.patch b/recipes/onnxruntime/all/patches/1.14.1-0001-cmake-dependencies.patch index 2201aeaba401d6..0b5b28fdc67e3b 100644 --- a/recipes/onnxruntime/all/patches/1.14.1-0001-cmake-dependencies.patch +++ b/recipes/onnxruntime/all/patches/1.14.1-0001-cmake-dependencies.patch @@ -46,10 +46,12 @@ + FIND_PACKAGE_ARGS REQUIRED CONFIG NAMES Eigen3 ) endif() - FetchContent_Populate(eigen) - set(eigen_INCLUDE_DIRS "${eigen_SOURCE_DIR}") -+ # onnxruntime_fetchcontent_makeavailable(eigen) -+ # get_target_property(eigen_INCLUDE_DIRS Eigen3::Eigen INTERFACE_INCLUDE_DIRECTORIES) +- FetchContent_Populate(eigen) +- set(eigen_INCLUDE_DIRS "${eigen_SOURCE_DIR}") ++ # FetchContent_Populate(eigen) ++ # set(eigen_INCLUDE_DIRS "${eigen_SOURCE_DIR}") ++ onnxruntime_fetchcontent_makeavailable(eigen) ++ get_target_property(eigen_INCLUDE_DIRS Eigen3::Eigen INTERFACE_INCLUDE_DIRECTORIES) endif() --- a/cmake/external/onnxruntime_external_deps.cmake +++ b/cmake/external/onnxruntime_external_deps.cmake