generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Pass the HAVE_QT* flags through the config header, like all others.

Browse Source 
I don't know why it didn't work for the original author, but it definitely
works now.
This commit is contained in:
Roman Donchenko 2013-06-19 17:44:12 +04:00
parent 1d9660c6d2
commit 37d19b9c46
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmake/OpenCVFindLibsGUI.cmake
View File

@ -24,7 +24,6 @@ if(WITH_QT)
if(Qt5Core_FOUND AND Qt5Gui_FOUND AND Qt5Widgets_FOUND AND Qt5Test_FOUND AND Qt5Concurrent_FOUND) if(Qt5Core_FOUND AND Qt5Gui_FOUND AND Qt5Widgets_FOUND AND Qt5Test_FOUND AND Qt5Concurrent_FOUND)
set(HAVE_QT5 ON) set(HAVE_QT5 ON)
set(HAVE_QT ON) set(HAVE_QT ON)
add_definitions(-DHAVE_QT)
find_package(Qt5OpenGL) find_package(Qt5OpenGL)
if(Qt5OpenGL_FOUND) if(Qt5OpenGL_FOUND)
set(QT_QTOPENGL_FOUND ON) set(QT_QTOPENGL_FOUND ON)
@ -36,7 +35,6 @@ if(WITH_QT)
find_package(Qt4 REQUIRED QtCore QtGui QtTest) find_package(Qt4 REQUIRED QtCore QtGui QtTest)
if(QT4_FOUND) if(QT4_FOUND)
set(HAVE_QT TRUE) set(HAVE_QT TRUE)
add_definitions(-DHAVE_QT) # We need to define the macro this way, using cvconfig.h does not work
endif() endif()
endif() endif()
endif() endif()
@ -61,7 +59,6 @@ if(WITH_OPENGL)
list(APPEND OPENCV_LINKER_LIBS ${OPENGL_LIBRARIES}) list(APPEND OPENCV_LINKER_LIBS ${OPENGL_LIBRARIES})
if(QT_QTOPENGL_FOUND) if(QT_QTOPENGL_FOUND)
set(HAVE_QT_OPENGL TRUE) set(HAVE_QT_OPENGL TRUE)
add_definitions(-DHAVE_QT_OPENGL)
else() else()
ocv_include_directories(${OPENGL_INCLUDE_DIR}) ocv_include_directories(${OPENGL_INCLUDE_DIR})
endif() endif()

6
cmake/templates/cvconfig.h.cmake
View File

@ -228,3 +228,9 @@
/* Clp support */ /* Clp support */
#cmakedefine HAVE_CLP #cmakedefine HAVE_CLP
/* Qt support */
#cmakedefine HAVE_QT
/* Qt OpenGL support */
#cmakedefine HAVE_QT_OPENGL

1
modules/highgui/src/window_QT.cpp
View File

@ -38,6 +38,7 @@
//--------------------Google Code 2010 -- Yannick Verdie--------------------// //--------------------Google Code 2010 -- Yannick Verdie--------------------//
#include "precomp.hpp"
#if defined(HAVE_QT) #if defined(HAVE_QT)