ONNXRuntime CMake: Use standard ONNXRuntime lowercase library syntax, remove obsolete wrapper, move detection from toplevel CMake to dependencies

Author: davidrohr

CMakeLists.txt

@@ -41,8 +41,6 @@ o2_build_sanity_checks()
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
 
-include(dependencies/FindONNXRuntime.cmake)
-
 include(O2CheckCXXFeatures)
 o2_check_cxx_features()
 

Common/ML/CMakeLists.txt

@@ -12,7 +12,7 @@
 o2_add_library(ML
                SOURCES src/OrtInterface.cxx
                TARGETVARNAME targetName
-               PRIVATE_LINK_LIBRARIES O2::Framework ONNXRuntime::ONNXRuntime)
+               PRIVATE_LINK_LIBRARIES O2::Framework onnxruntime::onnxruntime)
 
 # Pass ORT variables as a preprocessor definition
 target_compile_definitions(${targetName} PRIVATE

GPU/GPUTracking/Base/cuda/CMakeLists.txt

@@ -114,7 +114,7 @@ if(ALIGPU_BUILD_TYPE STREQUAL "O2")
     ${MODULE}
     SOURCES ${SRCS}
     PUBLIC_LINK_LIBRARIES O2::GPUTracking O2::ITStrackingCUDA
-    PRIVATE_LINK_LIBRARIES ONNXRuntime::ONNXRuntime
+    PRIVATE_LINK_LIBRARIES onnxruntime::onnxruntime
     PRIVATE_INCLUDE_DIRECTORIES
       ${CMAKE_SOURCE_DIR}/Detectors/Base/src
       ${CMAKE_SOURCE_DIR}/Detectors/TRD/base/src

GPU/GPUTracking/Base/hip/CMakeLists.txt

@@ -162,7 +162,7 @@ if(ALIGPU_BUILD_TYPE STREQUAL "O2")
     ${MODULE}
     SOURCES ${SRCS}
     PUBLIC_LINK_LIBRARIES O2::GPUTracking O2::ITStrackingHIP
-    PRIVATE_LINK_LIBRARIES ONNXRuntime::ONNXRuntime
+    PRIVATE_LINK_LIBRARIES onnxruntime::onnxruntime
     PRIVATE_INCLUDE_DIRECTORIES
       ${CMAKE_SOURCE_DIR}/Detectors/Base/src
       ${CMAKE_SOURCE_DIR}/Detectors/TRD/base/src

GPU/GPUTracking/CMakeLists.txt

@@ -343,7 +343,7 @@ if(ALIGPU_BUILD_TYPE STREQUAL "O2")
                                        O2::DetectorsRaw
                                        O2::Steer
                                        O2::ML
-                 PRIVATE_LINK_LIBRARIES ONNXRuntime::ONNXRuntime
+                 PRIVATE_LINK_LIBRARIES onnxruntime::onnxruntime
                  PUBLIC_INCLUDE_DIRECTORIES ${INCDIRS}
                  SOURCES ${SRCS} ${SRCS_NO_CINT} ${SRCS_NO_H})
 

dependencies/FindONNXRuntime.cmake

@@ -69,6 +69,9 @@ if (NOT TARGET Gandiva::gandiva_shared)
   add_library(Gandiva::gandiva_shared ALIAS gandiva_shared)
 endif()
 
+find_package(onnxruntime CONFIG)
+set_package_properties(onnxruntime PROPERTIES TYPE REQUIRED)
+
 find_package(Vc)
 set_package_properties(Vc PROPERTIES TYPE REQUIRED)