From 512cb4fceda94c237707bde0ae21a6a106ac35c2 Mon Sep 17 00:00:00 2001 From: Tony Date: Sat, 12 Apr 2014 22:43:42 +0100 Subject: [PATCH] Correction to enable compilation on platform with only GTK2 libs modified: CMakeLists.txt modified: cmake/OpenCVFindLibsGUI.cmake --- CMakeLists.txt | 10 +++++----- cmake/OpenCVFindLibsGUI.cmake | 4 +++- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9b1a2fe25..a741aacaf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -749,14 +749,14 @@ else() endif() else() if(HAVE_GTK3) - status(" GTK+ 3.x:" HAVE_GTK THEN "YES (ver ${ALIASOF_gtk+-3.0_VERSION})" ELSE NO) + status(" GTK+ 3.x:" HAVE_GTK THEN "YES (ver ${ALIASOF_gtk+-3.0_VERSION})" ELSE NO) elseif(HAVE_GTK) - status(" GTK+ 2.x:" HAVE_GTK THEN "YES (ver ${ALIASOF_gtk+-2.0_VERSION})" ELSE NO) + status(" GTK+ 2.x:" HAVE_GTK THEN "YES (ver ${ALIASOF_gtk+-2.0_VERSION})" ELSE NO) else() - status(" GTK+:" NO) + status(" GTK+:" NO) endif() - status(" GThread :" HAVE_GTHREAD THEN "YES (ver ${ALIASOF_gthread-2.0_VERSION})" ELSE NO) - status(" GtkGlExt:" HAVE_GTKGLEXT THEN "YES (ver ${ALIASOF_gtkglext-1.0_VERSION})" ELSE NO) + status(" GThread :" HAVE_GTHREAD THEN "YES (ver ${ALIASOF_gthread-2.0_VERSION})" ELSE NO) + status(" GtkGlExt:" HAVE_GTKGLEXT THEN "YES (ver ${ALIASOF_gtkglext-1.0_VERSION})" ELSE NO) endif() endif() endif() diff --git a/cmake/OpenCVFindLibsGUI.cmake b/cmake/OpenCVFindLibsGUI.cmake index c182628e3..14bfe4cce 100644 --- a/cmake/OpenCVFindLibsGUI.cmake +++ b/cmake/OpenCVFindLibsGUI.cmake @@ -43,7 +43,9 @@ ocv_clear_vars(HAVE_GTK HAVE_GTK3 HAVE_GTHREAD HAVE_GTKGLEXT) if(WITH_GTK AND NOT HAVE_QT) if(NOT WITH_GTK_2_X) CHECK_MODULE(gtk+-3.0 HAVE_GTK3) - set(HAVE_GTK HAVE_GTK3) + if(HAVE_GTK3) + set(HAVE_GTK TRUE) + endif() endif() if(NOT HAVE_GTK) CHECK_MODULE(gtk+-2.0 HAVE_GTK)