aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcodicodi <rob.ceglinski@gmail.com>2017-03-13 23:29:40 +0100
committercodicodi <rob.ceglinski@gmail.com>2017-03-13 23:29:40 +0100
commit83e75913770c182e7be500113d5779a82debf353 (patch)
treea209a782bc27ba3a283b06276594060c25c75e7d
parentdf1a11d56f80f440d8537916ec09b0f6ad529e16 (diff)
downloadvcpkg-83e75913770c182e7be500113d5779a82debf353.tar.gz
vcpkg-83e75913770c182e7be500113d5779a82debf353.zip
[glib] update to 2.50.3
-rw-r--r--ports/glib/CMakeLists.txt3
-rw-r--r--ports/glib/CONTROL2
-rw-r--r--ports/glib/portfile.cmake12
3 files changed, 10 insertions, 7 deletions
diff --git a/ports/glib/CMakeLists.txt b/ports/glib/CMakeLists.txt
index 341ab1a62..67f0ba10f 100644
--- a/ports/glib/CMakeLists.txt
+++ b/ports/glib/CMakeLists.txt
@@ -1,7 +1,6 @@
cmake_minimum_required(VERSION 3.0)
-project(glib)
+project(glib C)
-set(GLIB_VERSION 2.50.2)
set(GLIB_DLL_SUFFIX 2)
set(GLIB_LIB_SUFFIX 2.0)
diff --git a/ports/glib/CONTROL b/ports/glib/CONTROL
index 984d7576a..f34cb6c6b 100644
--- a/ports/glib/CONTROL
+++ b/ports/glib/CONTROL
@@ -1,4 +1,4 @@
Source: glib
-Version: 2.50.2
+Version: 2.50.3
Description: Portable, general-purpose utility library.
Build-Depends: zlib, pcre, libffi, gettext, libiconv
diff --git a/ports/glib/portfile.cmake b/ports/glib/portfile.cmake
index 71f1f366c..a3de1f33f 100644
--- a/ports/glib/portfile.cmake
+++ b/ports/glib/portfile.cmake
@@ -10,11 +10,12 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
endif()
include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/glib-2.50.2)
+set(GLIB_VERSION 2.50.3)
+set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/glib-${GLIB_VERSION})
vcpkg_download_distfile(ARCHIVE
- URLS "https://ftp.gnome.org/pub/gnome/sources/glib/2.50/glib-2.50.2.tar.xz"
- FILENAME "glib-2.50.2.tar.xz"
- SHA512 63d7b5ece8d7d15b10e06ef10a8e0a4446f30a8d9c97daa3352ec00dfef622728bd42ed24cbf67e553166a0f9e29a3e3d024d1d085b9804fd67608db438b6771)
+ URLS "https://ftp.gnome.org/pub/gnome/sources/glib/2.50/glib-${GLIB_VERSION}.tar.xz"
+ FILENAME "glib-${GLIB_VERSION}.tar.xz"
+ SHA512 ef35806c15170b6608445f255136c0bebd2d433adf903c2af2865f6a57b4f2fcfc1e4a7cea1a0dac48ff5fe26248fbf7886dba4a8d209506f0a94160df8fb7af)
vcpkg_extract_source_archive(${ARCHIVE})
vcpkg_apply_patches(
@@ -29,6 +30,9 @@ file(REMOVE ${SOURCE_PATH}/glib/win_iconv.c)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
+ PREFER_NINJA
+ OPTIONS
+ -DGLIB_VERSION=${GLIB_VERSION}
OPTIONS_DEBUG
-DGLIB_SKIP_HEADERS=ON
-DGLIB_SKIP_TOOLS=ON)