summaryrefslogtreecommitdiffhomepage
path: root/CMakeLists.txt
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2013-04-27 11:54:48 +0200
committerStanislaw Halik <sthalik@misaki.pl>2013-04-27 11:54:48 +0200
commitc7c3bfc9a1558864b06319918900090c7564c6d2 (patch)
treeaa53e2e9395c0197d2ab46585a15293a2423cfd8 /CMakeLists.txt
parentbf45260ce8f235e593a22cdbdf9bcd98d508ae7f (diff)
Get rid of last remnants of QOpenGL
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt7
1 files changed, 3 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c4b44d5c..7bd7b261 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 QtDesigner QtXml QtOpenGL QtNetwork REQUIRED)
+ find_package(Qt4 COMPONENTS QtCore QtGui QtDesigner QtXml QtNetwork REQUIRED)
macro(QT4_WRAP_CPP outfiles)
# get include dirs
QT4_GET_MOC_FLAGS(moc_flags)
@@ -308,9 +308,9 @@ endif()
endif()
IF(CMAKE_BUILD_TYPE MATCHES DEBUG)
- SET(MY_QT_LIBS ${QT_QTCORE_LIBRARY_DEBUG} ${QT_QTGUI_LIBRARY_DEBUG} ${QT_QTNETWORK_LIBRARY_DEBUG} ${QT_QTXML_LIBRARY_DEBUG} ${QT_QTOPENGL_LIBRARY_DEBUG})
+ SET(MY_QT_LIBS ${QT_QTCORE_LIBRARY_DEBUG} ${QT_QTGUI_LIBRARY_DEBUG} ${QT_QTNETWORK_LIBRARY_DEBUG} ${QT_QTXML_LIBRARY_DEBUG})
ELSE()
- SET(MY_QT_LIBS ${QT_QTCORE_LIBRARY_RELEASE} ${QT_QTGUI_LIBRARY_RELEASE} ${QT_QTNETWORK_LIBRARY_RELEASE} ${QT_QTXML_LIBRARY_RELEASE} ${QT_QTOPENGL_LIBRARY_RELEASE})
+ SET(MY_QT_LIBS ${QT_QTCORE_LIBRARY_RELEASE} ${QT_QTGUI_LIBRARY_RELEASE} ${QT_QTNETWORK_LIBRARY_RELEASE} ${QT_QTXML_LIBRARY_RELEASE})
ENDIF()
add_library(ftnoir-csv SHARED ${ftnoir-csv-c})
@@ -613,7 +613,6 @@ if(NOT SDK_FACEAPI_ONLY)
"${qt-dirname}/QtCore4.dll"
"${qt-dirname}/QtGui4.dll"
"${qt-dirname}/QtNetwork4.dll"
- "${qt-dirname}/QtOpenGL4.dll"
"${qt-dirname}/QtSvg4.dll"
"${qt-dirname}/QtXml4.dll"
DESTINATION .