IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2024-11-23 01:16:43 -06:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
John Ralls 2017-07-23 15:49:47 -07:00
parent 18ef968ff1
commit e41410ef25
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -353,7 +353,7 @@ IF(APPLE)
IF(TARGET_RESULT STREQUAL "quartz") IF(TARGET_RESULT STREQUAL "quartz")
SET(GNC_PLATFORM_COCOA 1) SET(GNC_PLATFORM_COCOA 1)
SET(GDK_QUARTZ 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) IF (GTK_MAC_FOUND)
SET(MAC_INTEGRATION 1) SET(MAC_INTEGRATION 1)
FIND_LIBRARY(COCOA_LIBRARY Cocoa) FIND_LIBRARY(COCOA_LIBRARY Cocoa)

2
configure.ac
View File

@ -420,7 +420,7 @@ update to latest darwin])
AC_DEFINE(GNC_PLATFORM_COCOA, 1, [Cocoa/Nexstep/GnuStep framework]) AC_DEFINE(GNC_PLATFORM_COCOA, 1, [Cocoa/Nexstep/GnuStep framework])
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
AC_DEFINE(GDK_QUARTZ,,[Using GDK Quartz (not X11)]) 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]) [_gtk_mac=yes], [_gtk_mac=no])
if test "x$_gtk_mac" = xyes; then if test "x$_gtk_mac" = xyes; then
GTK_MAC_LIBS="${GTK_MAC_LIBS} -lobjc -framework Cocoa" GTK_MAC_LIBS="${GTK_MAC_LIBS} -lobjc -framework Cocoa"