mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-25 06:57:50 +08:00
8ccb84df72
* [scripts] update Boost ports generation script, fixes #35187 * [boost] remove obsolete patches and re-generate ports * update versions * [boost] remove redundant vcpkg_minimum_required * update versions * [scripts/boost] update dependencies to config/checks, review b2-options.cmake files * [boost-*] regenerate ports * [boost-locale] fix patch * update versions * [boost-serialization] fix checks * update version * [boost-*] better fixes related to the config checks * update version * [boost-cobalt] fix build * update versions * [liblas] Boost v1.84.0 requires C++11 * [pcl] fix Unix build * add versions * [vcpkg-cmake-get-vars] add CMAKE_<LANG>_COMPILER_VERSION * [boost-cobalt] detect compiler * [coin] force C++11 * [json5-parser] force C++11 * add versions * [boost-cobalt] exclude iOS and Android platforms due to C++ Concepts library is not supported * [gtsam] force C++11 * [kenlm] force C++11 * [quickfast] force C++11 * [liblas] force C++11 * update versions * [boost] re-generate port * update version * [kenlm] revert changes * [boost-cobalt] exclude OSX * update versions * [plc] remove useless patch after merge * update versions after merge --------- Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
91 lines
4.7 KiB
Diff
91 lines
4.7 KiB
Diff
build/Jamfile.v2 | 44 +++++++++++++-------------------------------
|
|
1 file changed, 13 insertions(+), 31 deletions(-)
|
|
|
|
diff --git a/build/Jamfile.v2 b/build/Jamfile.v2
|
|
index f1e2d05..f946a9b 100644
|
|
--- a/build/Jamfile.v2
|
|
+++ b/build/Jamfile.v2
|
|
@@ -22,6 +22,7 @@ project /boost/locale
|
|
# Features
|
|
|
|
feature.feature boost.locale.iconv : on off : optional propagated ;
|
|
+feature.feature boost.locale.force-found-iconv : on off : optional propagated ;
|
|
feature.feature boost.locale.icu : on off : optional propagated ;
|
|
feature.feature boost.locale.posix : on off : optional propagated ;
|
|
feature.feature boost.locale.std : on off : optional propagated ;
|
|
@@ -132,13 +133,7 @@ if $(ICU_ICUUC_NAME)
|
|
}
|
|
else
|
|
{
|
|
- lib icuuc : : <runtime-link>shared <conditional>@path_options ;
|
|
- lib icuuc : : <toolset>msvc <variant>debug <name>icuucd <runtime-link>shared <conditional>@path_options ;
|
|
- lib icuuc : : <toolset>intel <target-os>windows <variant>debug <name>icuucd <runtime-link>shared <conditional>@path_options ;
|
|
- lib icuuc : : <name>sicuuc <runtime-link>static <conditional>@path_options ;
|
|
- lib icuuc : : <toolset>msvc <variant>debug <name>sicuucd <runtime-link>static <conditional>@path_options ;
|
|
- lib icuuc : : <toolset>intel <target-os>windows <variant>debug <name>sicuucd <runtime-link>static <conditional>@path_options ;
|
|
- lib icuuc : : <name>this_is_an_invalid_library_name ;
|
|
+ alias icuuc : /user-config//icuuc ;
|
|
}
|
|
|
|
if $(ICU_ICUDT_NAME)
|
|
@@ -148,13 +143,7 @@ if $(ICU_ICUDT_NAME)
|
|
}
|
|
else
|
|
{
|
|
- lib icudt : : <name>icudata <runtime-link>shared <conditional>@path_options ;
|
|
- lib icudt : : <name>icudt <toolset>msvc <runtime-link>shared <conditional>@path_options ;
|
|
- lib icudt : : <name>icudt <toolset>intel <target-os>windows <runtime-link>shared <conditional>@path_options ;
|
|
- lib icudt : : <name>sicudata <runtime-link>static <conditional>@path_options ;
|
|
- lib icudt : : <name>sicudt <toolset>msvc <runtime-link>static <conditional>@path_options ;
|
|
- lib icudt : : <name>sicudt <toolset>intel <target-os>windows <runtime-link>static <conditional>@path_options ;
|
|
- lib icudt : : <name>this_is_an_invalid_library_name ;
|
|
+ alias icudt : /user-config//icudt ;
|
|
}
|
|
|
|
if $(ICU_ICUIN_NAME)
|
|
@@ -164,27 +153,16 @@ if $(ICU_ICUIN_NAME)
|
|
}
|
|
else
|
|
{
|
|
- lib icuin : : <name>icui18n <runtime-link>shared <conditional>@path_options ;
|
|
- lib icuin : : <toolset>msvc <variant>debug <name>icuind <runtime-link>shared <conditional>@path_options ;
|
|
- lib icuin : : <toolset>msvc <name>icuin <runtime-link>shared <conditional>@path_options ;
|
|
- lib icuin : : <toolset>intel <target-os>windows <variant>debug <name>icuind <runtime-link>shared <conditional>@path_options ;
|
|
- lib icuin : : <toolset>intel <target-os>windows <name>icuin <runtime-link>shared <conditional>@path_options ;
|
|
- lib icuin : : <name>sicui18n <runtime-link>static <conditional>@path_options ;
|
|
- lib icuin : : <toolset>msvc <variant>debug <name>sicuind <runtime-link>static <conditional>@path_options ;
|
|
- lib icuin : : <toolset>msvc <name>sicuin <runtime-link>static <conditional>@path_options ;
|
|
- lib icuin : : <toolset>intel <target-os>windows <variant>debug <name>sicuind <runtime-link>static <conditional>@path_options ;
|
|
- lib icuin : : <toolset>intel <target-os>windows <name>sicuin <runtime-link>static <conditional>@path_options ;
|
|
- lib icuin : : <name>this_is_an_invalid_library_name ;
|
|
+ alias icuin : /user-config//icuin ;
|
|
}
|
|
|
|
+explicit icuuc icuin icudt ;
|
|
+
|
|
ICU_OPTS =
|
|
<include>$(.icu-path)/include
|
|
- <runtime-link>shared:<library>icuuc/<link>shared
|
|
- <runtime-link>shared:<library>icudt/<link>shared
|
|
- <runtime-link>shared:<library>icuin/<link>shared
|
|
- <runtime-link>static:<library>icuuc
|
|
- <runtime-link>static:<library>icudt
|
|
- <runtime-link>static:<library>icuin
|
|
+ <library>icuuc
|
|
+ <library>icudt
|
|
+ <library>icuin
|
|
<target-os>windows,<toolset>clang:<linkflags>"advapi32.lib"
|
|
<runtime-link>static:<define>U_STATIC_IMPLEMENTATION=1
|
|
;
|
|
@@ -213,6 +191,10 @@ rule configure-full ( properties * : flags-only )
|
|
}
|
|
|
|
local found-iconv ;
|
|
+ if <boost.locale.force-found-iconv>on in $(properties)
|
|
+ {
|
|
+ found-iconv = true ;
|
|
+ }
|
|
|
|
if ! <boost.locale.iconv>off in $(properties)
|
|
{
|