diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2015-10-30 10:09:58 +0100 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2015-10-30 10:09:58 +0100 |
| commit | 36273c6dfdd9a0a22e396b354213eb492886afaf (patch) | |
| tree | 23152837b6f861d9e0ca667141e8b34cf90398a6 /filter-kalman | |
| parent | 3bdd6411060dce095528239acc1812d4e7180371 (diff) | |
| parent | 48c30a3d75d18e87e39c18cb52961bb37ab6055e (diff) | |
Merge branch 'unstable' into trackhat
Diffstat (limited to 'filter-kalman')
| -rw-r--r-- | filter-kalman/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | filter-kalman/ftnoir_kalman_filtercontrols.ui | 4 |
2 files changed, 8 insertions, 6 deletions
diff --git a/filter-kalman/CMakeLists.txt b/filter-kalman/CMakeLists.txt index 666a35db8..e2796c11f 100644 --- a/filter-kalman/CMakeLists.txt +++ b/filter-kalman/CMakeLists.txt @@ -1,4 +1,6 @@ -find_package(OpenCV 3.0) -opentrack_boilerplate(opentrack-filter-kalman) -target_link_libraries(opentrack-filter-kalman ${OpenCV_LIBS}) -target_include_directories(opentrack-filter-kalman SYSTEM PUBLIC ${OpenCV_INCLUDE_DIRS}) +find_package(OpenCV 3.0 QUIET) +if(OpenCV_FOUND) + opentrack_boilerplate(opentrack-filter-kalman) + target_link_libraries(opentrack-filter-kalman ${OpenCV_LIBS}) + target_include_directories(opentrack-filter-kalman SYSTEM PUBLIC ${OpenCV_INCLUDE_DIRS}) +endif() diff --git a/filter-kalman/ftnoir_kalman_filtercontrols.ui b/filter-kalman/ftnoir_kalman_filtercontrols.ui index 69297102e..df2138159 100644 --- a/filter-kalman/ftnoir_kalman_filtercontrols.ui +++ b/filter-kalman/ftnoir_kalman_filtercontrols.ui @@ -23,7 +23,7 @@ <string>Kalman settings</string> </property> <property name="windowIcon"> - <iconset resource="../facetracknoir/ui-res.qrc"> + <iconset resource="../gui/ui-res.qrc"> <normaloff>:/images/filter-16.png</normaloff>:/images/filter-16.png</iconset> </property> <property name="layoutDirection"> @@ -88,7 +88,7 @@ </layout> </widget> <resources> - <include location="../facetracknoir/ui-res.qrc"/> + <include location="../gui/ui-res.qrc"/> </resources> <connections/> <designerdata> |