From 838bb4bdeb3f283ab13a20a507a1d639135a0812 Mon Sep 17 00:00:00 2001 From: Tony Date: Tue, 8 Apr 2014 21:21:40 +0100 Subject: [PATCH] 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. --- CMakeLists.txt | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 66a63f0ca..e8e75bf29 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()