From 1e3d62e04f78e2d0e22b3ceb67aaf20a03f18bbc Mon Sep 17 00:00:00 2001
From: Guillaume Dollé <dolle.guillaume@gmail.com>
Date: Mon, 2 Aug 2021 02:21:01 +0200
Subject: Fix include path for release package

* Revert include header changes
* Address the following review remarks for include path

https://github.com/opentrack/opentrack/pull/1306#discussion_r680548570
https://github.com/opentrack/opentrack/pull/1306#discussion_r680548755
https://github.com/opentrack/opentrack/pull/1306#discussion_r680548800
https://github.com/opentrack/opentrack/pull/1306#discussion_r680549144
---
 cmake/FindONNXRuntime.cmake                  | 4 +++-
 tracker-neuralnet/CMakeLists.txt             | 9 ++-------
 tracker-neuralnet/ftnoir_tracker_neuralnet.h | 2 +-
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/cmake/FindONNXRuntime.cmake b/cmake/FindONNXRuntime.cmake
index f485ecdd..7350ec0d 100644
--- a/cmake/FindONNXRuntime.cmake
+++ b/cmake/FindONNXRuntime.cmake
@@ -19,7 +19,9 @@
 
 find_library(ORT_LIB onnxruntime
     CMAKE_FIND_ROOT_PATH_BOTH)
-find_path(ORT_INCLUDE onnxruntime/core/session/onnxruntime_cxx_api.h
+
+find_path(ORT_INCLUDE onnxruntime_cxx_api.h
+    PATH_SUFFIXES onnxruntime/core/session
     CMAKE_FIND_ROOT_PATH_BOTH)
 
 if(ORT_LIB AND ORT_INCLUDE)
diff --git a/tracker-neuralnet/CMakeLists.txt b/tracker-neuralnet/CMakeLists.txt
index 36395684..bcdbbc81 100644
--- a/tracker-neuralnet/CMakeLists.txt
+++ b/tracker-neuralnet/CMakeLists.txt
@@ -5,14 +5,9 @@ find_package(ONNXRuntime QUIET)
 
 if(OpenCV_FOUND AND ONNXRuntime_FOUND AND OpenMP_FOUND)
     otr_module(tracker-neuralnet)
-    target_include_directories(${self} 
-        SYSTEM PRIVATE 
-        ${OpenCV_INCLUDE_DIRS} 
-        ${ONNXRuntime_INCLUDE_DIRS}
-        )
     target_link_libraries(${self} 
-        opentrack-cv 
-        ${ONNXRuntime_LIBRARIES} 
+        opentrack-cv
+        onnxruntime
         ${OpenCV_LIBS} 
         OpenMP::OpenMP_C
         )
diff --git a/tracker-neuralnet/ftnoir_tracker_neuralnet.h b/tracker-neuralnet/ftnoir_tracker_neuralnet.h
index 6c3af079..7f496dc6 100644
--- a/tracker-neuralnet/ftnoir_tracker_neuralnet.h
+++ b/tracker-neuralnet/ftnoir_tracker_neuralnet.h
@@ -26,7 +26,7 @@
 #include <memory>
 #include <cinttypes>
 
-#include <onnxruntime/core/session/onnxruntime_cxx_api.h>
+#include <onnxruntime_cxx_api.h>
 
 #include <opencv2/core.hpp>
 #include <opencv2/core/types.hpp>
-- 
cgit v1.2.3