Skip to content

O
opencv
Commit 16470016 authored by Yannick Verdie's avatar Yannick Verdie
Browse files
Options

Qt backend development: 

Fixed CMake cached variables
parent c685ca0e
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 5 deletions
CMakeLists.txt
View file @ 16470016
...@@ -502,7 +502,7 @@ endif() ...@@ -502,7 +502,7 @@ endif()
############################### QT ################################ ############################### QT ################################
set(HAVE_QT 0) set(HAVE_QT 0)
set(HAVE_QT_OPENGL 0) set(HAVE_QT_OPENGL 0)
set(AUTOSWITCH_QT 0)#uses to disable QT set(AUTOSWITCH_QT 1)#uses to disable QT
#set the booleans #set the booleans
find_package(Qt4)# QUIET) find_package(Qt4)# QUIET)
...@@ -522,19 +522,18 @@ if (WITH_QT) ...@@ -522,19 +522,18 @@ if (WITH_QT)
if(UNIX) if(UNIX)
if (APPLE) if (APPLE)
set(WITH_CARBON 0) set(WITH_CARBON OFF CACHE BOOL "Use Carbon for UI instead of Cocoa" FORCE)
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(WITH_GTK OFF CACHE BOOL "Include GTK support" FORCE)
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 enabled")
set(HAVE_QT_OPENGL 1) set(HAVE_QT_OPENGL 1)
add_definitions(-DOPENCV_GL=1) add_definitions(-DOPENCV_GL=1)
endif() endif()
......
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