summaryrefslogtreecommitdiffhomepage
path: root/CMakeLists.txt
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2013-04-27 05:19:16 +0200
committerStanislaw Halik <sthalik@misaki.pl>2013-04-27 05:19:16 +0200
commit9a0be62918cd1c8a4c8736d40707ed5f5560623f (patch)
treeeea7130e3cb1e6ea2fafdf0e6f4acf27f1692d64 /CMakeLists.txt
parent2d74bdc525992929f8ba584edeedb99b9a695c57 (diff)
Support 1:1 mapping up to 180 degrees for inertial trackers
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt8
1 files changed, 3 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4f10b370..2217de2e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,7 +24,7 @@ include_directories(${CMAKE_SOURCE_DIR})
if(NOT SDK_FACEAPI_ONLY)
find_package(OpenCV REQUIRED)
- find_package(Qt4 COMPONENTS QtCore QtGui QtXml QtOpenGL QtNetwork REQUIRED)
+ find_package(Qt4 COMPONENTS QtCore QtGui QtDesigner QtXml QtOpenGL QtNetwork REQUIRED)
macro(QT4_WRAP_CPP outfiles)
# get include dirs
QT4_GET_MOC_FLAGS(moc_flags)
@@ -65,9 +65,7 @@ if(NOT SDK_FACEAPI_ONLY)
include_directories(${QXT_QXTGUI_INCLUDE_DIR}/QxtGui)
endif()
endif()
- if(NOT WIN32)
- INCLUDE_DIRECTORIES(${QT_QTDESIGNER_INCLUDE_DIR})
- endif()
+ INCLUDE_DIRECTORIES(${QT_QTDESIGNER_INCLUDE_DIR})
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/qfunctionconfigurator)
@@ -319,7 +317,7 @@ endif()
add_library(ftnoir-pose-widget SHARED ${ftnoir-pose-widget-c} ${ftnoir-pose-widget-moc} ${ftnoir-pose-widget-rcc})
target_link_libraries(ftnoir-pose-widget ${MY_QT_LIBS} ${OPENGL_gl_LIBRARY})
- add_library(ftnoir-spline-widget SHARED ${ftnoir-spline-widget-c} ${ftnoir-spline-widget-moc} ${MY_QT_LIBS})
+ add_library(ftnoir-spline-widget SHARED ${ftnoir-spline-widget-c} ${ftnoir-spline-widget-moc} ${MY_QT_LIBS} ${QT_QTDESIGNER_LIBRARY_RELEASE})
target_link_libraries(ftnoir-spline-widget ${MY_QT_LIBS})
add_library(ftnoir-filter-accela SHARED ${ftnoir-filter-accela-c} ${ftnoir-filter-accela-moc} ${ftnoir-filter-accela-uih} ${ftnoir-filter-accela-rcc})