diff options
| author | yurybura <yurybura@gmail.com> | 2020-05-13 20:26:05 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-13 10:26:05 -0700 |
| commit | 24e8be5fcfddd0da98b58a63cd918849787fb06f (patch) | |
| tree | 328e0bd25684f1392419547c1b3360e06ba5845b /ports/boost-locale | |
| parent | 597038559647776ee39d02dcf159da05d9342f1d (diff) | |
| download | vcpkg-24e8be5fcfddd0da98b58a63cd918849787fb06f.tar.gz vcpkg-24e8be5fcfddd0da98b58a63cd918849787fb06f.zip | |
[boost] update to 1.73.0 (#11221)
* [boost] update to 1.73
* [ompl] remove dependency to boost-disjoint-sets
* [libtorrent] include fixes from RC_1_2 branch
* [liblas] fix boost headers
* [freeopcua] fix std headers
* [pcl] fix build with Boost 1.73.0
* [hpx] fix build with Boost 1.73.0
* [libmysql] fix conflict with C++20 header <version>
* [boost-modular-build-helper] move port-specific b2 options to the file `<port_dir>/b2-options.cmake`
[boost-python] support Python2 (fixes #3495)
* [boost-python] remove Python executable from user-config
* [libtorrent] update version after merge
* [libtorrent] add boost-variant dependency
Diffstat (limited to 'ports/boost-locale')
| -rw-r--r-- | ports/boost-locale/CONTROL | 4 | ||||
| -rw-r--r-- | ports/boost-locale/b2-options.cmake | 25 | ||||
| -rw-r--r-- | ports/boost-locale/cmake-fragment.cmake | 10 | ||||
| -rw-r--r-- | ports/boost-locale/portfile.cmake | 19 |
4 files changed, 30 insertions, 28 deletions
diff --git a/ports/boost-locale/CONTROL b/ports/boost-locale/CONTROL index bd20f1283..cb63e046f 100644 --- a/ports/boost-locale/CONTROL +++ b/ports/boost-locale/CONTROL @@ -1,10 +1,10 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-locale
-Version: 1.72.0
+Version: 1.73.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-system, boost-thread, boost-type-traits, boost-unordered, boost-vcpkg-helpers, libiconv (!uwp&!windows)
Homepage: https://github.com/boostorg/locale
Description: Boost locale module
Feature: icu
-Description: ICU backend for Boost.Locale
Build-Depends: icu
+Description: ICU backend for Boost.Locale
diff --git a/ports/boost-locale/b2-options.cmake b/ports/boost-locale/b2-options.cmake new file mode 100644 index 000000000..0a7deddca --- /dev/null +++ b/ports/boost-locale/b2-options.cmake @@ -0,0 +1,25 @@ +if(VCPKG_TARGET_IS_WINDOWS)
+ if("icu" IN_LIST FEATURES)
+ set(BOOST_LOCALE_ICU on)
+ else()
+ set(BOOST_LOCALE_ICU off)
+ endif()
+
+ list(APPEND B2_OPTIONS
+ boost.locale.iconv=off
+ boost.locale.posix=off
+ /boost/locale//boost_locale
+ boost.locale.icu=${BOOST_LOCALE_ICU}
+ )
+else()
+ 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_DIR}
+ )
+endif()
\ No newline at end of file diff --git a/ports/boost-locale/cmake-fragment.cmake b/ports/boost-locale/cmake-fragment.cmake deleted file mode 100644 index 11d3ed70e..000000000 --- a/ports/boost-locale/cmake-fragment.cmake +++ /dev/null @@ -1,10 +0,0 @@ -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 569e0acdf..7bc25c767 100644 --- a/ports/boost-locale/portfile.cmake +++ b/ports/boost-locale/portfile.cmake @@ -1,30 +1,17 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
-include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/locale
- REF boost-1.72.0
- SHA512 a32a92b4d393f31ca6ba35ceb3d8802b4764e8aa9c8ff5417f3a0f0c886f473b635d613af743764d244459dccb4e285ac6fa50a9eed8d10183fa9954c131b85d
+ REF boost-1.73.0
+ SHA512 0af88d8db7b18395a2b3668bcb51a5f32cd0de9acb9633572c2fb7edcdf06f354802392606394cf75ec4fd4d9cfe5c96351db766e55f8ef30f746b0a7017ad1f
HEAD_REF master
)
-if("icu" IN_LIST FEATURES)
- set(BOOST_LOCALE_ICU on)
-else()
- set(BOOST_LOCALE_ICU off)
-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
- /boost/locale//boost_locale
- boost.locale.icu=${BOOST_LOCALE_ICU}
+ BOOST_CMAKE_FRAGMENT "${CMAKE_CURRENT_LIST_DIR}/b2-options.cmake"
)
include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
|