From 77d6abaf53dbe2ee6334bd59b112e25d694a2f65 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Tue, 1 Nov 2022 12:34:34 +0100 Subject: now remove cmake workarounds for onnxruntime Followup from #1562. --- sdk-paths-sthalik@MSVC-windows.cmake | 3 --- tracker-neuralnet/CMakeLists.txt | 4 ---- 2 files changed, 7 deletions(-) diff --git a/sdk-paths-sthalik@MSVC-windows.cmake b/sdk-paths-sthalik@MSVC-windows.cmake index b64446b4..7df31152 100644 --- a/sdk-paths-sthalik@MSVC-windows.cmake +++ b/sdk-paths-sthalik@MSVC-windows.cmake @@ -34,9 +34,6 @@ setq(SDK_RIFT_140 "ovr_sdk_win_23.0.0/LibOVR") setq(SDK_VALVE_STEAMVR "steamvr") setq(SDK_VJOYSTICK "vjoystick") setq(ONNXRuntime_DIR "onnxruntime-1.12.1") -#setq(ONNXRuntime_INCLUDE_DIR "onnxruntime-1.12.1/include") -#setq(ONNXRuntime_LIBRARY "onnxruntime-1.12.1/lib/onnxruntime.lib") -#setq(ONNXRuntime_RUNTIME "onnxruntime-1.12.1/bin/onnxruntime.dll") setq(SDK_TRACKHAT_SENSOR "../trackhat/trackhat-c-library-driver/build/install") set(CMAKE_ASM_NASM_COMPILER nasm.exe CACHE FILEPATH "" FORCE) diff --git a/tracker-neuralnet/CMakeLists.txt b/tracker-neuralnet/CMakeLists.txt index c9d380ab..f414c920 100644 --- a/tracker-neuralnet/CMakeLists.txt +++ b/tracker-neuralnet/CMakeLists.txt @@ -9,10 +9,6 @@ if(OpenCV_FOUND AND ONNXRuntime_FOUND AND OpenMP_FOUND) add_definitions(-D_HAS_EXCEPTIONS=1) endif() - if(EXISTS "${ONNXRuntime_INCLUDE_DIR}/onnxruntime/core/session/.") - include_directories("${ONNXRuntime_INCLUDE_DIR}/onnxruntime/core/session") - endif() - otr_module(tracker-neuralnet) target_link_libraries(${self} -- cgit v1.2.3