diff options
| author | Long Nguyen <nguyen.long.908132@gmail.com> | 2020-11-26 02:26:33 +0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-25 11:26:33 -0800 |
| commit | e2ff466f65a82dd31584468ddf67955092c79c11 (patch) | |
| tree | 71f24ccffa8d99d36871930a4533d583992971e0 /ports | |
| parent | 8d2332660cbfa23edd99abf2ea41ff6e2d7134b7 (diff) | |
| download | vcpkg-e2ff466f65a82dd31584468ddf67955092c79c11.tar.gz vcpkg-e2ff466f65a82dd31584468ddf67955092c79c11.zip | |
[boost-locale] Replace VCPKG_TARGET_IS_WINDOWS in b2-options (#14502)
* [boost-locale] Use CMAKE_SYSTEM_NAME as a fallback where VCPKG_TARGET_IS_WINDOWS is not available
* fix this issue in a different way
* Remove comments in b2-options.cmake.in
Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
* fix generate-ports.ps1
Co-authored-by: Nicole Mazzuca <mazzucan@outlook.com>
Diffstat (limited to 'ports')
| -rw-r--r-- | ports/boost-locale/CONTROL | 3 | ||||
| -rw-r--r-- | ports/boost-locale/b2-options.cmake.in (renamed from ports/boost-locale/b2-options.cmake) | 17 | ||||
| -rw-r--r-- | ports/boost-locale/portfile.cmake | 9 |
3 files changed, 18 insertions, 11 deletions
diff --git a/ports/boost-locale/CONTROL b/ports/boost-locale/CONTROL index 63714c5a7..306cfa32a 100644 --- a/ports/boost-locale/CONTROL +++ b/ports/boost-locale/CONTROL @@ -1,6 +1,7 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
+# Automatically generated by scripts/boost/generate-ports.ps1
Source: boost-locale
Version: 1.74.0
+Port-Version: 1
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
diff --git a/ports/boost-locale/b2-options.cmake b/ports/boost-locale/b2-options.cmake.in index 6bd353e1d..d1df5d6c5 100644 --- a/ports/boost-locale/b2-options.cmake +++ b/ports/boost-locale/b2-options.cmake.in @@ -1,15 +1,16 @@ -if(VCPKG_TARGET_IS_WINDOWS)
- if("icu" IN_LIST FEATURES)
- set(BOOST_LOCALE_ICU on)
- else()
- set(BOOST_LOCALE_ICU off)
- endif()
+set(_B2_OPTIONS_FEATURES "@FEATURES@")
+if("icu" IN_LIST _B2_OPTIONS_FEATURES)
+ set(BOOST_LOCALE_ICU_FEATURE on)
+else()
+ set(BOOST_LOCALE_ICU_FEATURE off)
+endif()
+if(@VCPKG_TARGET_IS_WINDOWS@)
list(APPEND B2_OPTIONS
boost.locale.iconv=off
boost.locale.posix=off
/boost/locale//boost_locale
- boost.locale.icu=${BOOST_LOCALE_ICU}
+ boost.locale.icu=${BOOST_LOCALE_ICU_FEATURE}
)
else()
find_library(LIBICONV_LIBRARY iconv)
@@ -19,7 +20,7 @@ else() boost.locale.iconv=on
boost.locale.posix=on
/boost/locale//boost_locale
- boost.locale.icu=off
+ boost.locale.icu=${BOOST_LOCALE_ICU_FEATURE}
-sICONV_PATH=${LIBICONV_DIR}
)
if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Emscripten" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "wasm32")
diff --git a/ports/boost-locale/portfile.cmake b/ports/boost-locale/portfile.cmake index fa62041db..445569a41 100644 --- a/ports/boost-locale/portfile.cmake +++ b/ports/boost-locale/portfile.cmake @@ -1,4 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
+# Automatically generated by scripts/boost/generate-ports.ps1
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
@@ -12,9 +12,14 @@ vcpkg_from_github( )
include(${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)
+configure_file(
+ "${CMAKE_CURRENT_LIST_DIR}/b2-options.cmake.in"
+ "${CURRENT_BUILDTREES_DIR}/vcpkg-b2-options.cmake"
+ @ONLY
+)
boost_modular_build(
SOURCE_PATH ${SOURCE_PATH}
- BOOST_CMAKE_FRAGMENT "${CMAKE_CURRENT_LIST_DIR}/b2-options.cmake"
+ BOOST_CMAKE_FRAGMENT "${CURRENT_BUILDTREES_DIR}/vcpkg-b2-options.cmake"
)
include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
|