This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 2710aae7522473b21180799f2de310b0575abc3e (commit)
via 0e9bf6a257d2a2026bcd1d8f52f5a3d42ff9fabd (commit)
via 9e952fbf18bddec90b874d7b0139a6ca3b78f0c9 (commit)
from 75f4a82144cf3643e887ade282da2d12f108f9a9 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2710aae7522473b21180799f2de310b0575abc3e
commit 2710aae7522473b21180799f2de310b0575abc3e
Merge: 75f4a82 0e9bf6a
Author: Daniele E. Domenichelli <daniele.domeniche...@gmail.com>
AuthorDate: Sun Nov 24 08:59:30 2013 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Sun Nov 24 08:59:30 2013 -0500
Merge topic 'FindGTK2-quartz-backend' into next
0e9bf6a FindGTK2: Add support for Quartz backend on MAC
9e952fb CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0e9bf6a257d2a2026bcd1d8f52f5a3d42ff9fabd
commit 0e9bf6a257d2a2026bcd1d8f52f5a3d42ff9fabd
Author: Daniele E. Domenichelli <daniele.domeniche...@iit.it>
AuthorDate: Sun Nov 24 14:52:39 2013 +0100
Commit: Daniele E. Domenichelli <daniele.domeniche...@iit.it>
CommitDate: Sun Nov 24 14:53:47 2013 +0100
FindGTK2: Add support for Quartz backend on MAC
Fix issue #14593
diff --git a/Modules/FindGTK2.cmake b/Modules/FindGTK2.cmake
index 25c482e..bc66337 100644
--- a/Modules/FindGTK2.cmake
+++ b/Modules/FindGTK2.cmake
@@ -689,7 +689,12 @@ foreach(_GTK2_component ${GTK2_FIND_COMPONENTS})
_GTK2_FIND_INCLUDE_DIR(GDK gdk/gdk.h)
_GTK2_FIND_INCLUDE_DIR(GDKCONFIG gdkconfig.h)
if(UNIX)
- _GTK2_FIND_LIBRARY (GDK gdk-x11 false true)
+ if(APPLE)
+ _GTK2_FIND_LIBRARY (GDK gdk-quartz false true)
+ endif()
+ if(NOT GTK2_GDK_FOUND)
+ _GTK2_FIND_LIBRARY (GDK gdk-x11 false true)
+ endif()
else()
_GTK2_FIND_LIBRARY (GDK gdk-win32 false true)
endif()
@@ -698,7 +703,12 @@ foreach(_GTK2_component ${GTK2_FIND_COMPONENTS})
_GTK2_FIND_INCLUDE_DIR(GTK gtk/gtk.h)
if(UNIX)
- _GTK2_FIND_LIBRARY (GTK gtk-x11 false true)
+ if(APPLE)
+ _GTK2_FIND_LIBRARY (GTK gtk-quartz false true)
+ endif()
+ if(NOT GTK2_GTK_FOUND)
+ _GTK2_FIND_LIBRARY (GTK gtk-x11 false true)
+ endif()
else()
_GTK2_FIND_LIBRARY (GTK gtk-win32 false true)
endif()
-----------------------------------------------------------------------
Summary of changes:
Modules/FindGTK2.cmake | 14 ++++++++++++--
Source/CMakeVersion.cmake | 2 +-
2 files changed, 13 insertions(+), 3 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
