From 9652184dfaa483b1fe55d7ed7b81a22a4502d2de Mon Sep 17 00:00:00 2001 From: Maja Kabus Date: Fri, 18 Jun 2021 13:35:56 +0200 Subject: [PATCH 1/2] Integrated ONNXRuntime into O2 --- dependencies/O2Dependencies.cmake | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dependencies/O2Dependencies.cmake b/dependencies/O2Dependencies.cmake index 70e0b66ff9222..33b492f82e225 100644 --- a/dependencies/O2Dependencies.cmake +++ b/dependencies/O2Dependencies.cmake @@ -98,6 +98,9 @@ set_package_properties(RapidJSON PROPERTIES TYPE REQUIRED) find_package(CURL) set_package_properties(CURL PROPERTIES TYPE REQUIRED) +find_package(ONNXRuntime::ONNXRuntime CONFIG) +set_package_properties(ONNXRuntime::ONNXRuntime PROPERTIES TYPE REQUIRED) + find_package(JAliEnROOT MODULE) set_package_properties(JAliEnROOT PROPERTIES TYPE RECOMMENDED) From 6c3f1c56492c7d56e0bec2dc179923cd7008f4d7 Mon Sep 17 00:00:00 2001 From: Maja Kabus Date: Fri, 18 Jun 2021 18:18:40 +0200 Subject: [PATCH 2/2] Added BUILD_ANALYSIS check --- dependencies/O2Dependencies.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dependencies/O2Dependencies.cmake b/dependencies/O2Dependencies.cmake index 33b492f82e225..2f6ac04895ad3 100644 --- a/dependencies/O2Dependencies.cmake +++ b/dependencies/O2Dependencies.cmake @@ -98,8 +98,10 @@ set_package_properties(RapidJSON PROPERTIES TYPE REQUIRED) find_package(CURL) set_package_properties(CURL PROPERTIES TYPE REQUIRED) +if(BUILD_ANALYSIS) find_package(ONNXRuntime::ONNXRuntime CONFIG) set_package_properties(ONNXRuntime::ONNXRuntime PROPERTIES TYPE REQUIRED) +endif() find_package(JAliEnROOT MODULE) set_package_properties(JAliEnROOT PROPERTIES TYPE RECOMMENDED)