diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2015-07-12 07:09:46 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2015-07-12 07:09:46 +0200 |
| commit | c986731a379191e096a965f4d741bc3853820b8f (patch) | |
| tree | f50ece78a831ac20e9a1e5994854f196d8980fd8 /CMakeLists.txt | |
| parent | 78e20c5173ae722ddac1499df25e40a3ab6d0f3e (diff) | |
| parent | f396490f2d15d699d8299b91406a9791b38c7237 (diff) | |
Merge branch 'unstable' into trackhat-ui
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 31 |
1 files changed, 20 insertions, 11 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 601f935d..8674e907 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,10 @@ project(opentrack) cmake_minimum_required(VERSION 2.8.11) cmake_policy(SET CMP0020 NEW) if(POLICY CMP0058) - cmake_policy(SET CMP0058 OLD) + cmake_policy(SET CMP0058 OLD) +endif() +if(POLICY CMP0028) + cmake_policy(SET CMP0028 OLD) endif() include(CMakeParseArguments) @@ -160,8 +163,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() @@ -311,10 +316,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) @@ -374,9 +377,16 @@ if(OpenCV_FOUND) #target_include_directories(opentrack-tracker-aruco SYSTEM PUBLIC ${OpenCV_INCLUDE_DIRS}) endif() - #opentrack_library(opentrack-filter-kalman ftnoir_filter_kalman) - #target_link_libraries(opentrack-filter-kalman ${OpenCV_LIBS}) - #target_include_directories(opentrack-filter-kalman SYSTEM PUBLIC ${OpenCV_INCLUDE_DIRS}) +#target_link_libraries(opentrack-filter-kalman ${OpenCV_LIBS}) +#target_include_directories(opentrack-filter-kalman 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() #opentrack_library(opentrack-tracker-ht ftnoir_tracker_ht) @@ -498,9 +508,6 @@ if(NOT WIN32) endif() target_link_libraries(opentrack opentrack-api opentrack-version opentrack-pose-widget opentrack-spline-widget) -target_include_directories(opentrack SYSTEM PUBLIC ${OpenCV_INCLUDE_DIRS}) -target_link_libraries(opentrack ${OpenCV_LIBS}) - if(APPLE) SET_TARGET_PROPERTIES(opentrack-qxt-mini PROPERTIES LINK_FLAGS "-framework Carbon -framework CoreFoundation") endif() @@ -508,6 +515,8 @@ endif() if(UNIX OR APPLE) target_link_libraries(opentrack opentrack-qxt-mini) endif() +target_include_directories(opentrack SYSTEM PUBLIC ${OpenCV_INCLUDE_DIRS}) +target_link_libraries(opentrack ${OpenCV_LIBS}) link_with_dinput8(opentrack) target_link_libraries(opentrack ${MY_QT_LIBS}) |