diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2016-11-17 08:07:43 +0100 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2016-11-18 03:46:55 +0100 |
| commit | 6844ab95d9e1908831e97df4db9fdc7776e34489 (patch) | |
| tree | 4a813d4e5ad3c3d43e94a7e92c96b61fda4b3426 /tracker-aruco/CMakeLists.txt | |
| parent | 9797c16bf50b6292d45347b3f42eb04bfdcbf7e2 (diff) | |
tracker/aruco: back out changes since rc7
However, include some crash fixes and minor changes.
Fixes #481
Reported-by: @Emton
Testing-by: @Emton
Diffstat (limited to 'tracker-aruco/CMakeLists.txt')
| -rw-r--r-- | tracker-aruco/CMakeLists.txt | 14 |
1 files changed, 8 insertions, 6 deletions
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() |