build: Use CONFIG mode for onnxruntime (#4086)

Switch to using CMake's CONFIG mode for finding ONNX. This also deletes the find module we ship as of now.
acts-project · Feb 14, 2025 · e4606c6 · e4606c6
1 parent 4e0bf58
commit e4606c6
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 85 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -443,7 +443,7 @@ if(ACTS_BUILD_PLUGIN_EXATRKX)
     endif()
 endif()
 if(ACTS_BUILD_PLUGIN_ONNX OR ACTS_EXATRKX_ENABLE_ONNX)
-    find_package(OnnxRuntime ${_acts_onnxruntime_version} REQUIRED)
+    find_package(onnxruntime ${_acts_onnxruntime_version} CONFIG REQUIRED)
 endif()
 if(ACTS_BUILD_PLUGIN_EDM4HEP OR ACTS_BUILD_PLUGIN_PODIO)
     find_package(podio ${_acts_podio_version} CONFIG)

diff --git a/Plugins/Onnx/CMakeLists.txt b/Plugins/Onnx/CMakeLists.txt
@@ -18,7 +18,7 @@ target_include_directories(
         $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
 )
 
-target_link_libraries(ActsPluginOnnx PUBLIC ActsCore OnnxRuntime)
+target_link_libraries(ActsPluginOnnx PUBLIC ActsCore onnxruntime::onnxruntime)
 
 install(
     TARGETS ActsPluginOnnx

diff --git a/Plugins/Onnx/include/Acts/Plugins/Onnx/OnnxRuntimeBase.hpp b/Plugins/Onnx/include/Acts/Plugins/Onnx/OnnxRuntimeBase.hpp
@@ -11,7 +11,7 @@
 #include <vector>
 
 #include <Eigen/Dense>
-#include <onnxruntime_cxx_api.h>
+#include <onnxruntime/onnxruntime_cxx_api.h>
 
 namespace Acts {
 

diff --git a/Plugins/Onnx/include/Acts/Plugins/Onnx/SeedClassifier.hpp b/Plugins/Onnx/include/Acts/Plugins/Onnx/SeedClassifier.hpp
@@ -12,7 +12,7 @@
 
 #include <vector>
 
-#include <onnxruntime_cxx_api.h>
+#include <onnxruntime/onnxruntime_cxx_api.h>
 
 namespace Acts {
 

diff --git a/cmake/ActsCreatePackageConfig.cmake b/cmake/ActsCreatePackageConfig.cmake
@@ -26,12 +26,6 @@ install(
     DESTINATION ${install_package_config_dir}
 )
 
-# install third party FindXXX.cmake files
-install(
-    FILES ${CMAKE_CURRENT_LIST_DIR}/FindOnnxRuntime.cmake
-    DESTINATION ${install_package_config_dir}/Modules
-)
-
 # install target configs for all available components
 foreach(_component ${_components})
     install(

diff --git a/cmake/FindOnnxRuntime.cmake b/cmake/FindOnnxRuntime.cmake