[geary/bug/728002-webkit2: 46/140] Move WebKit2GTK target version to root cmake file for consistency.
- From: Michael Gratton <mjog src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [geary/bug/728002-webkit2: 46/140] Move WebKit2GTK target version to root cmake file for consistency.
- Date: Tue, 31 Jan 2017 23:02:24 +0000 (UTC)
commit ef48c5daecb0bdb79fda368dceee3b4ae26707b9
Author: Michael James Gratton <mike vee net>
Date: Wed Dec 21 20:12:06 2016 +1030
Move WebKit2GTK target version to root cmake file for consistency.
CMakeLists.txt | 1 +
src/CMakeLists.txt | 2 --
2 files changed, 1 insertions(+), 2 deletions(-)
---
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 09146f6..aacb525 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,6 +29,7 @@ set(LANGUAGE_SUPPORT_DIRECTORY ${CMAKE_INSTALL_PREFIX}/share/locale)
#
set(TARGET_GLIB 2.42) # Also passed to valac, so don't include a point rev
set(TARGET_GTK 3.14.0)
+set(TARGET_WEBKIT 2.10)
if (NOT ISO_CODE_639_XML)
find_path(ISOCODES_DIRECTORY NAMES iso_639.xml PATHS ${CMAKE_INSTALL_PREFIX} /usr/share/xml/iso-codes)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 40651c1..f0e4da9 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -485,8 +485,6 @@ else ()
)
endif ()
-set(TARGET_WEBKIT 2.10)
-
pkg_check_modules(DEPS REQUIRED
gthread-2.0
glib-2.0>=${TARGET_GLIB}.0
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]