gnucash master: [Mac] use gtk-mac-integration-gtk3 now that we're building with gtk3.

John Ralls jralls at code.gnucash.org
Sun Jul 23 18:52:15 EDT 2017


Updated	 via  https://github.com/Gnucash/gnucash/commit/e41410ef (commit)
	from  https://github.com/Gnucash/gnucash/commit/18ef968f (commit)



commit e41410ef2558c10ea8112f79ad4302bd5bffc990
Author: John Ralls <jralls at ceridwen.us>
Date:   Sun Jul 23 15:49:47 2017 -0700

    [Mac] use gtk-mac-integration-gtk3 now that we're building with gtk3.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e601cf0..d11240f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -353,7 +353,7 @@ IF(APPLE)
   IF(TARGET_RESULT STREQUAL "quartz")
     SET(GNC_PLATFORM_COCOA 1)
     SET(GDK_QUARTZ 1)
-    GNC_PKG_CHECK_MODULES(GTK_MAC gtk-mac-integration-gtk2)
+    GNC_PKG_CHECK_MODULES(GTK_MAC gtk-mac-integration-gtk3)
     IF (GTK_MAC_FOUND)
       SET(MAC_INTEGRATION 1)
       FIND_LIBRARY(COCOA_LIBRARY Cocoa)
diff --git a/configure.ac b/configure.ac
index b95a4d0..a54f375 100644
--- a/configure.ac
+++ b/configure.ac
@@ -420,7 +420,7 @@ update to latest  darwin])
       AC_DEFINE(GNC_PLATFORM_COCOA, 1, [Cocoa/Nexstep/GnuStep framework])
       AC_MSG_RESULT(yes)
       AC_DEFINE(GDK_QUARTZ,,[Using GDK Quartz (not X11)])
-      PKG_CHECK_MODULES([GTK_MAC], gtk-mac-integration-gtk2,
+      PKG_CHECK_MODULES([GTK_MAC], gtk-mac-integration-gtk3,
                         [_gtk_mac=yes], [_gtk_mac=no])
       if test "x$_gtk_mac" = xyes; then
         GTK_MAC_LIBS="${GTK_MAC_LIBS} -lobjc -framework Cocoa"



Summary of changes:
 CMakeLists.txt | 2 +-
 configure.ac   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)



More information about the gnucash-changes mailing list