1 files changed, 11 insertions, 16 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9c858587..b483000d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -153,8 +153,10 @@ SET(SDK_RIFT "" CACHE PATH "libOVR path for Oculus Rift")
 
 set(SDK_ARUCO_LIBPATH "" CACHE FILEPATH "Aruco paper marker tracker static library path")
 
+set(SDK_HT "" CACHE FILEPATH "Path to headtracker library")
+set(SDK_HT_FLANDMARK "" CACHE FILEPATH "Path to flandmark library for headtracker")
+
 if(WIN32)
-    set(SDK_SIMCONNECT "" CACHE PATH "SimConnect SDK path for MS FSX")
     set(SDK_FSUIPC "" CACHE PATH "FSUIPC for older MS FSX path")
 endif()
 
@@ -305,10 +307,8 @@ if(SDK_FSUIPC)
     #target_link_directories(${SDK_FSUIPC})
 endif()
 
-if(SDK_SIMCONNECT)
+if(WIN32)
     opentrack_library(opentrack-proto-simconnect ftnoir_protocol_sc)
-    target_link_libraries(opentrack-proto-simconnect ${SDK_SIMCONNECT}/lib/SimConnect.lib)
-    include_directories(opentrack-proto-simconnect SYSTEM PUBLIC ${SDK_SIMCONNECT}/inc)
 endif()
 
 if(WIN32)
@@ -371,11 +371,13 @@ if(OpenCV_FOUND)
     target_link_libraries(opentrack-filter-kalman ${OpenCV_LIBS})
     target_include_directories(opentrack-filter-kalman SYSTEM PUBLIC ${OpenCV_INCLUDE_DIRS})
 
-    opentrack_library(opentrack-tracker-ht ftnoir_tracker_ht)
-    target_link_libraries(opentrack-tracker-ht opentrack-compat)
-    link_with_dinput8(opentrack-tracker-ht)
-    target_link_libraries(opentrack-tracker-ht ${OpenCV_LIBS})
-    target_include_directories(opentrack-tracker-ht SYSTEM PUBLIC ${OpenCV_INCLUDE_DIRS})
+    if(SDK_HT AND SDK_HT_FLANDMARK)
+        opentrack_library(opentrack-tracker-ht ftnoir_tracker_ht)
+        target_link_libraries(opentrack-tracker-ht opentrack-compat ${SDK_HT} ${SDK_HT_FLANDMARK})
+        link_with_dinput8(opentrack-tracker-ht)
+        target_link_libraries(opentrack-tracker-ht ${OpenCV_LIBS})
+        target_include_directories(opentrack-tracker-ht SYSTEM PUBLIC ${OpenCV_INCLUDE_DIRS})
+    endif()
 endif()
 
 link_with_dinput8(opentrack-tracker-joystick)
@@ -491,8 +493,6 @@ if(NOT WIN32)
 endif()
 target_link_libraries(opentrack opentrack-api opentrack-version opentrack-pose-widget opentrack-spline-widget)
 
-
-
 if(APPLE)
     SET_TARGET_PROPERTIES(opentrack-qxt-mini PROPERTIES LINK_FLAGS "-framework Carbon -framework CoreFoundation")
 endif()
@@ -520,11 +520,6 @@ if(SDK_XPLANE)
     install(TARGETS opentrack-xplane-plugin RUNTIME DESTINATION . LIBRARY DESTINATION .  )
 endif()
 
-if(WIN32)
-    install(DIRECTORY ${CMAKE_SOURCE_DIR}/bin/tracker-ht DESTINATION .)
-    #install(TARGETS freetrackclient RUNTIME DESTINATION . LIBRARY DESTINATION .  )
-endif()
-
 install(DIRECTORY ${CMAKE_SOURCE_DIR}/3rdparty-notices DESTINATION .)
 
 install(FILES "${CMAKE_SOURCE_DIR}/bin/freetrackclient.dll" DESTINATION . ${opentrack-perms})