diff --git a/CMakeLists.txt b/CMakeLists.txt index 97cf0c586d444481e07c4427f19075a1e72990d4..5127460a1fd5a125f19e84b29826f2ad9b2e398d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -502,9 +502,16 @@ set(AUTOSWITCH_QT 0)#uses to disable QT find_package(Qt4)# QUIET) if (QT4_FOUND AND AUTOSWITCH_QT) set(WITH_QT ON CACHE BOOL "Build with QT Backend support") - find_package (OPENGL QUIET) + find_package (OpenGL QUIET) if (QT_QTOPENGL_FOUND AND OPENGL_FOUND) - set(WITH_QT_OPENGL ON CACHE BOOL "Add OpenGL extention to QT") + + #GLU is not mandatory but we used gluPerspective in setGL so, we need it for now. + if (OPENGL_GLU_FOUND) + set(WITH_QT_OPENGL ON CACHE BOOL "Add OpenGL extention to QT") + else() + message(STATUS "OpenGL found but not GLU, please install it") + endif() + endif() endif() @@ -519,14 +526,16 @@ if (WITH_QT) set(WITH_CARBON 0) message(STATUS "QT detected, so Carbon and Cocoa disabled") else() + set(WITH_GTK 0) set(HAVE_GTK 0) + set(WITH_GTHREAD 0) set(HAVE_GTHREAD 0) message(STATUS "QT detected, so GTK and GThread disabled") endif() endif() if (WITH_QT_OPENGL) - message(STATUS "OpenGL for QT enable") + message(STATUS "OpenGL for QT enable (with GLU)") set(HAVE_QT_OPENGL 1) add_definitions(-DOPENCV_GL=1) endif() diff --git a/modules/highgui/CMakeLists.txt b/modules/highgui/CMakeLists.txt index 634f9ec35c95f440d6f13d339a44c2fdc7b0840c..8e4f62b74827739101fb08bc4aa7df7e2fd8438d 100644 --- a/modules/highgui/CMakeLists.txt +++ b/modules/highgui/CMakeLists.txt @@ -72,6 +72,10 @@ if(WIN32) if (HAVE_QT) #SET(QT_USE_QTXML 1) + if (HAVE_QT_OPENGL) + set( QT_USE_QTOPENGL TRUE ) + set(HIGHGUI_LIBRARIES ${HIGHGUI_LIBRARIES} ${OPENGL_LIBRARIES}) + endif() INCLUDE(${QT_USE_FILE}) SET(_MOC_HEADERS src/window_QT.h ) @@ -95,6 +99,10 @@ if(UNIX) if (HAVE_QT) #SET(QT_USE_QTXML 1) + if (HAVE_QT_OPENGL) + set( QT_USE_QTOPENGL TRUE ) + set(HIGHGUI_LIBRARIES ${HIGHGUI_LIBRARIES} ${OPENGL_LIBRARIES}) + endif() INCLUDE(${QT_USE_FILE}) SET(_MOC_HEADERS src/window_QT.h) @@ -188,6 +196,10 @@ if(APPLE) if (HAVE_QT) #SET(QT_USE_QTXML 1) + if (HAVE_QT_OPENGL) + set( QT_USE_QTOPENGL TRUE ) + set(HIGHGUI_LIBRARIES ${HIGHGUI_LIBRARIES} ${OPENGL_LIBRARIES}) + endif() INCLUDE(${QT_USE_FILE}) SET(_MOC_HEADERS src/window_QT.h) diff --git a/modules/highgui/src/window_QT.h b/modules/highgui/src/window_QT.h index b8e8a2d67dd80ce5c38a63937e0bcc4ceab67ae5..f990d096dd7ba0ea4699973f3ab9af05658f967c 100644 --- a/modules/highgui/src/window_QT.h +++ b/modules/highgui/src/window_QT.h @@ -44,7 +44,9 @@ #include "precomp.hpp" #if defined(OPENCV_GL) -#include + #include + //#include +//#include #endif #include