summaryrefslogtreecommitdiffhomepage
path: root/CMakeLists.txt
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2015-07-17 10:49:31 +0200
committerStanislaw Halik <sthalik@misaki.pl>2015-07-18 01:53:44 +0200
commitc17264187594d325030fac243b4bc8ed02e52358 (patch)
treeb59bce533143f12387fb50d0f116f2130aee71fd /CMakeLists.txt
parent1eddf33ed39627ef8584bd482b10bea42fb063f0 (diff)
fix build
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3a21730e..f8ce4378 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -112,7 +112,7 @@ macro(opentrack_library n dir)
target_link_libraries(${n} opentrack-api ${MY_QT_LIBS})
if(CMAKE_COMPILER_IS_GNUCXX AND NOT APPLE)
SET_TARGET_PROPERTIES(${n} PROPERTIES
- LINK_FLAGS "${foolib_LINK} ${foolib_GNU-LINK} -Wl,--version-script=\"${CMAKE_SOURCE_DIR}/opentrack/${version-script}-version-script.txt\""
+ LINK_FLAGS "${foolib_LINK} ${foolib_GNU-LINK} -Wl,--as-needed -Wl,--version-script=\"${CMAKE_SOURCE_DIR}/opentrack/${version-script}-version-script.txt\""
COMPILE_FLAGS "${foolib_COMPILE} ${foolib_GNU-COMPILE} -fvisibility=hidden -fvisibility-inlines-hidden"
)
else()
@@ -365,6 +365,7 @@ if(OpenCV_FOUND)
opentrack_library(opentrack-tracker-aruco ftnoir_tracker_aruco)
target_link_libraries(opentrack-tracker-aruco ${SDK_ARUCO_LIBPATH} ${OpenCV_LIBS})
target_include_directories(opentrack-tracker-aruco SYSTEM PUBLIC ${OpenCV_INCLUDE_DIRS})
+ link_with_dinput8(opentrack-tracker-aruco)
endif()
opentrack_library(opentrack-filter-kalman ftnoir_filter_kalman)
@@ -373,9 +374,8 @@ if(OpenCV_FOUND)
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})
+ target_link_libraries(opentrack-tracker-ht opentrack-compat ${SDK_HT} ${SDK_HT_FLANDMARK} ${OpenCV_LIBS})
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()