From: Tony <exocoder@gmail.com>
Date: Tue, 8 Apr 2014 20:21:40 +0000 (+0100)
Subject: Fix bug in GTK+3 logic introduced by previous merge
X-Git-Tag: submit/tizen_ivi/20141117.190038~2^2~369^2~1^2~5
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=838bb4bdeb3f283ab13a20a507a1d639135a0812;p=profile%2Fivi%2Fopencv.git

Fix bug in GTK+3 logic introduced by previous merge

During merging of conflicting versions of this file, I erroneously
deleted several lines in the GUI reporting section. This is repaired
in this commit.
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 66a63f0..e8e75bf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -749,7 +749,15 @@ else()
         status("    Cocoa:"  YES)
       endif()
     else()
-      status("    GTK+ 2.x:" HAVE_GTK      THEN "YES (ver ${ALIASOF_gtk+-2.0_VERSION})"     ELSE NO)
+      if(HAVE_GTK3)
+        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)
+      else()
+        if(DEFINED WITH_GTK)
+          staus("    GTK+:" NO)
+        endif()
+      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)
     endif()