From 14eafd8a1dc5755494b4522acc7588af76a3456d Mon Sep 17 00:00:00 2001 From: John Ralls Date: Sat, 14 Oct 2017 14:26:04 -0700 Subject: [PATCH] Build Macs with WebKit1. Temporarily, I hope. Javascript isn't working with WebKit-2.16 but does with WebKit 2.4.11 and I don't want to hold up releasing 2.7.0 any longer. --- CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9265b6fbad..738b434d54 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -177,10 +177,10 @@ GNC_PKG_CHECK_MODULES (GTHREAD REQUIRED gthread-2.0>=2.20) GNC_PKG_CHECK_MODULES (LIBXML2 REQUIRED libxml-2.0>=2.7.0) GNC_PKG_CHECK_MODULES (LIBXSLT REQUIRED libxslt) -IF (WIN32) +IF (WIN32 OR APPLE) GNC_PKG_CHECK_MODULES (WEBKIT REQUIRED webkitgtk-3.0) SET(WEBKIT1 1) -ELSE (WIN32) +ELSE (WIN32 OR APPLE) GNC_PKG_CHECK_MODULES (WEBKIT webkit2gtk-4.0) IF (NOT WEBKIT_FOUND) GNC_PKG_CHECK_MODULES (WEBKIT REQUIRED webkit2gtk-3.0) @@ -188,7 +188,7 @@ ELSE (WIN32) ELSE (NOT WEBKIT_FOUND) SET(WEBKIT2_4 1) ENDIF (NOT WEBKIT_FOUND) -ENDIF (WIN32) +ENDIF (WIN32 OR APPLE) IF (WITH_GNUCASH) GNC_PKG_CHECK_MODULES (GTK3 REQUIRED gtk+-3.0>=3.10.0)