gnucash unstable: Fix Webkit1 configuration for Windows Builds.
John Ralls
jralls at code.gnucash.org
Sat Jan 27 19:43:59 EST 2018
Updated via https://github.com/Gnucash/gnucash/commit/83128e2f (commit)
from https://github.com/Gnucash/gnucash/commit/81f11874 (commit)
commit 83128e2f1d86958a3d14150f41c93c123557db00
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Jan 27 16:42:37 2018 -0800
Fix Webkit1 configuration for Windows Builds.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f355f32..65ddfca 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -192,7 +192,12 @@ 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 OR APPLE)
- GNC_PKG_CHECK_MODULES (WEBKIT1 REQUIRED webkitgtk-3.0)
+ GNC_PKG_CHECK_MODULES (WEBKIT1 REQUIRED webkitgtk-3.0)
+ SET(WEBKIT1 1)
+ SET(WEBKIT_CFLAGS ${WEBKIT2_CFLAGS})
+ SET(WEBKIT_INCLUDE_DIRS ${WEBKIT1_INCLUDE_DIRS})
+ SET(WEBKIT_LDFLAGS ${WEBKIT1_LDFLAGS})
+ SET(WEBKIT_LIBRARIES ${WEBKIT1_LIBRARIES})
ELSE (WIN32 OR APPLE)
GNC_PKG_CHECK_MODULES (WEBKIT2_4 webkit2gtk-4.0)
IF (NOT WEBKIT2_4_FOUND)
Summary of changes:
CMakeLists.txt | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
More information about the gnucash-changes
mailing list