From: Tony <exocoder@gmail.com>
Date: Sat, 12 Apr 2014 21:43:42 +0000 (+0100)
Subject: Correction to enable compilation on platform with only GTK2 libs
X-Git-Tag: submit/tizen_ivi/20141117.190038~2^2~369^2~1^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=512cb4fceda94c237707bde0ae21a6a106ac35c2;p=profile%2Fivi%2Fopencv.git

Correction to enable compilation on platform with only GTK2 libs

	modified:   CMakeLists.txt
	modified:   cmake/OpenCVFindLibsGUI.cmake
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9b1a2fe..a741aac 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 c182628..14bfe4c 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)