From ef48c5daecb0bdb79fda368dceee3b4ae26707b9 Mon Sep 17 00:00:00 2001 From: Michael James Gratton Date: Wed, 21 Dec 2016 20:12:06 +1030 Subject: [PATCH] Move WebKit2GTK target version to root cmake file for consistency. --- CMakeLists.txt | 1 + src/CMakeLists.txt | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 09146f66..aacb5259 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 40651c1d..f0e4da9d 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