From b831381cf569436177ada02366c4850a665b8465 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Tue, 17 Apr 2018 16:26:01 -0700 Subject: [boost] Improve non-windows support --- ports/boost-locale/CONTROL | 2 +- ports/boost-locale/cmake-fragment.cmake | 10 ++++++++++ ports/boost-locale/portfile.cmake | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 ports/boost-locale/cmake-fragment.cmake (limited to 'ports/boost-locale') diff --git a/ports/boost-locale/CONTROL b/ports/boost-locale/CONTROL index 0a37505b1..5ed156bdd 100644 --- a/ports/boost-locale/CONTROL +++ b/ports/boost-locale/CONTROL @@ -1,7 +1,7 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-locale Version: 1.66.0 -Build-Depends: boost-assert, boost-build, boost-modular-build-helper, boost-config, boost-function, boost-integer, boost-iterator, boost-smart-ptr, boost-static-assert, boost-thread (windows), boost-type-traits, boost-unordered, boost-vcpkg-helpers +Build-Depends: boost-assert, boost-build, boost-config, boost-function, boost-integer, boost-iterator, boost-modular-build-helper, boost-smart-ptr, boost-static-assert, boost-thread (!uwp), boost-type-traits, boost-unordered, boost-vcpkg-helpers, libiconv (!uwp&!windows) Description: Boost locale module Feature: icu diff --git a/ports/boost-locale/cmake-fragment.cmake b/ports/boost-locale/cmake-fragment.cmake new file mode 100644 index 000000000..11d3ed70e --- /dev/null +++ b/ports/boost-locale/cmake-fragment.cmake @@ -0,0 +1,10 @@ +find_library(LIBICONV_LIBRARY iconv) +get_filename_component(LIBICONV_DIR "${LIBICONV_LIBRARY}" DIRECTORY) + +list(APPEND B2_OPTIONS + boost.locale.iconv=on + boost.locale.posix=on + /boost/locale//boost_locale + boost.locale.icu=off + -sICONV_PATH=${LIBICONV_LIBRARY} +) diff --git a/ports/boost-locale/portfile.cmake b/ports/boost-locale/portfile.cmake index 9c1aa2ff4..e6d82a1a6 100644 --- a/ports/boost-locale/portfile.cmake +++ b/ports/boost-locale/portfile.cmake @@ -19,6 +19,7 @@ endif() include(${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) boost_modular_build( SOURCE_PATH ${SOURCE_PATH} + BOOST_CMAKE_FRAGMENT "${CMAKE_CURRENT_LIST_DIR}/cmake-fragment.cmake" OPTIONS boost.locale.iconv=off boost.locale.posix=off -- cgit v1.2.3 From 751015f6a44d6f89ca71ac63d7c5cab83cf531c0 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Tue, 17 Apr 2018 15:18:09 -0700 Subject: [boost] Update to 1.67 --- ports/boost-locale/CONTROL | 2 +- ports/boost-locale/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'ports/boost-locale') diff --git a/ports/boost-locale/CONTROL b/ports/boost-locale/CONTROL index 5ed156bdd..eca61edd4 100644 --- a/ports/boost-locale/CONTROL +++ b/ports/boost-locale/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-locale -Version: 1.66.0 +Version: 1.67.0 Build-Depends: boost-assert, boost-build, boost-config, boost-function, boost-integer, boost-iterator, boost-modular-build-helper, boost-smart-ptr, boost-static-assert, boost-thread (!uwp), boost-type-traits, boost-unordered, boost-vcpkg-helpers, libiconv (!uwp&!windows) Description: Boost locale module diff --git a/ports/boost-locale/portfile.cmake b/ports/boost-locale/portfile.cmake index e6d82a1a6..c4dbf9229 100644 --- a/ports/boost-locale/portfile.cmake +++ b/ports/boost-locale/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/locale - REF boost-1.66.0 - SHA512 558c84fe83909b9eb410ed5b846d2393733811e3765e99e41884a7fc7020163437a42584911b4f634706c1a0e79e23bb09bd6a3ffa219c9e524a10ace02728af + REF boost-1.67.0 + SHA512 220ed43884722e7a342b8fa5010e8659ccebcd106907c38052b411d710f110924a2b4622cb10e1302ad0553cf350430f02c63e3e66d45bb38b47d7eb022d01d9 HEAD_REF master ) -- cgit v1.2.3