From 6844ab95d9e1908831e97df4db9fdc7776e34489 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Thu, 17 Nov 2016 08:07:43 +0100 Subject: tracker/aruco: back out changes since rc7 However, include some crash fixes and minor changes. Fixes #481 Reported-by: @Emton Testing-by: @Emton --- tracker-aruco/CMakeLists.txt | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'tracker-aruco/CMakeLists.txt') diff --git a/tracker-aruco/CMakeLists.txt b/tracker-aruco/CMakeLists.txt index c0b50bee..d68b8f59 100644 --- a/tracker-aruco/CMakeLists.txt +++ b/tracker-aruco/CMakeLists.txt @@ -1,7 +1,9 @@ -find_package(OpenCV 3.0 QUIET COMPONENTS ${opencv-modules}) -set(SDK_ARUCO_LIBPATH "" CACHE FILEPATH "Aruco paper marker tracker static library path") -if(SDK_ARUCO_LIBPATH AND OpenCV_FOUND) - opentrack_boilerplate(opentrack-tracker-aruco) - target_link_libraries(opentrack-tracker-aruco opentrack-cv ${SDK_ARUCO_LIBPATH} ${OpenCV_LIBS}) - target_include_directories(opentrack-tracker-aruco SYSTEM PUBLIC ${OpenCV_INCLUDE_DIRS}) +find_package(OpenCV 3.0 QUIET) +if(OpenCV_FOUND) + set(SDK_ARUCO_LIBPATH "" CACHE FILEPATH "Aruco paper marker tracker static library path") + if(SDK_ARUCO_LIBPATH) + opentrack_boilerplate(opentrack-tracker-aruco) + target_link_libraries(opentrack-tracker-aruco opentrack-cv ${SDK_ARUCO_LIBPATH} ${OpenCV_LIBS}) + target_include_directories(opentrack-tracker-aruco SYSTEM PUBLIC ${OpenCV_INCLUDE_DIRS}) + endif() endif() -- cgit v1.2.3