Commit 397b31e4 authored by Yannick Verdie's avatar Yannick Verdie

New functions with QT GUI:

- fix CMake OpenGL compilation
parent 6314cd28
...@@ -502,9 +502,16 @@ set(AUTOSWITCH_QT 0)#uses to disable QT ...@@ -502,9 +502,16 @@ set(AUTOSWITCH_QT 0)#uses to disable QT
find_package(Qt4)# QUIET) find_package(Qt4)# QUIET)
if (QT4_FOUND AND AUTOSWITCH_QT) if (QT4_FOUND AND AUTOSWITCH_QT)
set(WITH_QT ON CACHE BOOL "Build with QT Backend support") 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) 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()
endif() endif()
...@@ -519,14 +526,16 @@ if (WITH_QT) ...@@ -519,14 +526,16 @@ if (WITH_QT)
set(WITH_CARBON 0) set(WITH_CARBON 0)
message(STATUS "QT detected, so Carbon and Cocoa disabled") message(STATUS "QT detected, so Carbon and Cocoa disabled")
else() else()
set(WITH_GTK 0)
set(HAVE_GTK 0) set(HAVE_GTK 0)
set(WITH_GTHREAD 0)
set(HAVE_GTHREAD 0) set(HAVE_GTHREAD 0)
message(STATUS "QT detected, so GTK and GThread disabled") message(STATUS "QT detected, so GTK and GThread disabled")
endif() endif()
endif() endif()
if (WITH_QT_OPENGL) if (WITH_QT_OPENGL)
message(STATUS "OpenGL for QT enable") message(STATUS "OpenGL for QT enable (with GLU)")
set(HAVE_QT_OPENGL 1) set(HAVE_QT_OPENGL 1)
add_definitions(-DOPENCV_GL=1) add_definitions(-DOPENCV_GL=1)
endif() endif()
......
...@@ -72,6 +72,10 @@ if(WIN32) ...@@ -72,6 +72,10 @@ if(WIN32)
if (HAVE_QT) if (HAVE_QT)
#SET(QT_USE_QTXML 1) #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}) INCLUDE(${QT_USE_FILE})
SET(_MOC_HEADERS src/window_QT.h ) SET(_MOC_HEADERS src/window_QT.h )
...@@ -95,6 +99,10 @@ if(UNIX) ...@@ -95,6 +99,10 @@ if(UNIX)
if (HAVE_QT) if (HAVE_QT)
#SET(QT_USE_QTXML 1) #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}) INCLUDE(${QT_USE_FILE})
SET(_MOC_HEADERS src/window_QT.h) SET(_MOC_HEADERS src/window_QT.h)
...@@ -188,6 +196,10 @@ if(APPLE) ...@@ -188,6 +196,10 @@ if(APPLE)
if (HAVE_QT) if (HAVE_QT)
#SET(QT_USE_QTXML 1) #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}) INCLUDE(${QT_USE_FILE})
SET(_MOC_HEADERS src/window_QT.h) SET(_MOC_HEADERS src/window_QT.h)
......
...@@ -44,7 +44,9 @@ ...@@ -44,7 +44,9 @@
#include "precomp.hpp" #include "precomp.hpp"
#if defined(OPENCV_GL) #if defined(OPENCV_GL)
#include <QGLWidget> #include <QtOpenGL>
//#include <GL/glu.h>
//#include <QGLWidget>
#endif #endif
#include <QAbstractEventDispatcher> #include <QAbstractEventDispatcher>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment