Merge pull request #1 from Microsoft/master

Update vcpkg from upstream

6 files changed, 221 insertions, 298 deletions

diff --git a/ports/boost/0001-Fix-boost-ICU-support.patch b/ports/boost/0001-Fix-boost-ICU-support.patch
new file mode 100644
index 000000000..1952f5a64
--- /dev/null
+++ b/ports/boost/0001-Fix-boost-ICU-support.patch
@@ -0,0 +1,166 @@
+---
+ libs/locale/build/Jamfile.v2       | 63 ++++++--------------------------------
+ libs/locale/build/has_icu_test.cpp |  4 ---
+ libs/regex/build/Jamfile.v2        | 47 +++++++---------------------
+ 3 files changed, 20 insertions(+), 94 deletions(-)
+
+diff --git a/libs/locale/build/Jamfile.v2 b/libs/locale/build/Jamfile.v2
+index 578e722..5f25917 100644
+--- a/libs/locale/build/Jamfile.v2
++++ b/libs/locale/build/Jamfile.v2
+@@ -70,62 +70,17 @@ if $(ICU_LINK)
+ }
+ else
+ {
+-    searched-lib icuuc : :  <name>icuuc
+-                            <search>$(ICU_PATH)/lib 
+-                            <link>shared 
+-                            <runtime-link>shared ;
+-
+-    searched-lib icuuc : :  <toolset>msvc
+-                            <variant>debug
+-                            <name>icuucd
+-                            <search>$(ICU_PATH)/lib
+-                            <link>shared
+-                            <runtime-link>shared ;
+-
+-    searched-lib icuuc : :  <name>this_is_an_invalid_library_name ;
+-
+-    searched-lib icudt : :  <search>$(ICU_PATH)/lib
+-                            <name>icudata
+-                            <link>shared
+-                            <runtime-link>shared ;
+-
+-    searched-lib icudt : :  <search>$(ICU_PATH)/lib
+-                            <name>icudt
+-                            <toolset>msvc
+-                            <link>shared
+-                            <runtime-link>shared ;
+-
+-    searched-lib icudt : :  <name>this_is_an_invalid_library_name ;
+-
+-    searched-lib icuin : :  <search>$(ICU_PATH)/lib
+-                            <name>icui18n
+-                            <link>shared
+-                            <runtime-link>shared ;
+-
+-    searched-lib icuin : :  <toolset>msvc
+-                            <variant>debug
+-                            <name>icuind
+-                            <search>$(ICU_PATH)/lib
+-                            <link>shared
+-                            <runtime-link>shared ;
+-
+-    searched-lib icuin : :  <toolset>msvc
+-                            <variant>release
+-                            <name>icuin
+-                            <search>$(ICU_PATH)/lib
+-                            <link>shared
+-                            <runtime-link>shared ;
+-
+-    searched-lib icuin : :  <name>this_is_an_invalid_library_name ;
+-
+-    explicit icuuc icudt icuin ;
++    alias icuuc : /user-config//icuuc ;
++    alias icuin : /user-config//icuin ;
++    alias icudt : /user-config//icudt ;
++
++    explicit icuuc icuin icudt ;
+ 
+     ICU_OPTS =   <include>$(ICU_PATH)/include 
+-      <library>icuuc/<link>shared/<runtime-link>shared 
+-      <library>icudt/<link>shared/<runtime-link>shared 
+-      <library>icuin/<link>shared/<runtime-link>shared
+-      <dll-path>$(ICU_PATH)/bin
+-        <runtime-link>shared ;
++      <library>icuuc
++      <library>icuin
++      <library>icudt
++      <dll-path>$(ICU_PATH)/bin ;
+ 
+ 
+ 
+diff --git a/libs/locale/build/has_icu_test.cpp b/libs/locale/build/has_icu_test.cpp
+index 9419b30..ed9be05 100644
+--- a/libs/locale/build/has_icu_test.cpp
++++ b/libs/locale/build/has_icu_test.cpp
+@@ -15,10 +15,6 @@
+ #include <unicode/uchar.h>
+ #include <unicode/coll.h>
+ 
+-#if defined(_MSC_VER) && !defined(_DLL)
+-#error "Mixing ICU with a static runtime doesn't work"
+-#endif
+-
+ int main()
+ {
+    icu::Locale loc;
+diff --git a/libs/regex/build/Jamfile.v2 b/libs/regex/build/Jamfile.v2
+index 58fd1fb..76ee9f4 100644
+--- a/libs/regex/build/Jamfile.v2
++++ b/libs/regex/build/Jamfile.v2
+@@ -48,50 +48,25 @@ if ! $(disable-icu)
+    }
+    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 ;
+-
+-      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 ;
+-
+-      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 icuuc : /user-config//icuuc ;
++      alias icuin : /user-config//icuin ;
++      alias icudt : /user-config//icudt ;
++      
++      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
+-         <define>BOOST_HAS_ICU=1 
+-         <runtime-link>static:<define>U_STATIC_IMPLEMENTATION=1
++         <library>icuuc
++         <library>icudt
++         <library>icuin
++         <define>BOOST_HAS_ICU=1
+          ;
+    }
+ 
+ }
+ 
+-unit-test has_icu : has_icu_test.cpp : $(ICU_OPTS) ;
++exe has_icu : has_icu_test.cpp : $(ICU_OPTS) ;
+ explicit has_icu ;
+ 
+ alias icu_options : : : : [ check-target-builds has_icu : $(ICU_OPTS) : ] ;
+-- 
+2.12.2.windows.2
+
diff --git a/ports/boost/CONTROL b/ports/boost/CONTROL
index ec2e77ffa..23fc8ef59 100644
--- a/ports/boost/CONTROL
+++ b/ports/boost/CONTROL
@@ -1,4 +1,9 @@
-Source: boost
-Version: 1.64-4
-Description: Peer-reviewed portable C++ source libraries
-Build-Depends: zlib, bzip2
+# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1

+Source: boost

+Version: 1.67.0

+Description: Peer-reviewed portable C++ source libraries

+Build-Depends: boost-accumulators, boost-algorithm, boost-align, boost-any, boost-array, boost-asio, boost-assert, boost-assign, boost-atomic, boost-beast, boost-bimap, boost-bind, boost-callable-traits, boost-chrono, boost-circular-buffer, boost-compatibility, boost-compute, boost-concept-check, boost-config, boost-container, boost-container-hash, boost-context (!uwp), boost-contract (!uwp), boost-conversion, boost-convert, boost-core, boost-coroutine (!uwp), boost-coroutine2, boost-crc, boost-date-time, boost-detail, boost-disjoint-sets, boost-dll, boost-dynamic-bitset, boost-endian, boost-exception, boost-fiber (windows), boost-filesystem (!uwp), boost-flyweight, boost-foreach, boost-format, boost-function, boost-functional, boost-function-types, boost-fusion, boost-geometry, boost-gil, boost-graph, boost-graph-parallel, boost-hana, boost-heap, boost-hof, boost-icl, boost-integer, boost-interprocess, boost-intrusive, boost-io, boost-iostreams (!uwp), boost-iterator, boost-lambda, boost-lexical-cast, boost-locale (!uwp), boost-local-function, boost-lockfree, boost-log (!uwp), boost-logic (!uwp), boost-math, boost-metaparse, boost-move, boost-mp11, boost-mpl, boost-msm, boost-multiprecision, boost-multi-array, boost-multi-index, boost-numeric-conversion, boost-interval, boost-odeint, boost-ublas, boost-optional, boost-parameter, boost-phoenix, boost-polygon, boost-poly-collection, boost-pool, boost-predef, boost-preprocessor, boost-process, boost-program-options (!uwp), boost-property-map, boost-property-tree, boost-proto, boost-ptr-container, boost-python (windows), boost-qvm, boost-random, boost-range, boost-ratio, boost-rational, boost-regex, boost-scope-exit, boost-serialization, boost-signals, boost-signals2, boost-smart-ptr, boost-sort, boost-spirit, boost-stacktrace (!uwp), boost-statechart, boost-static-assert, boost-system, boost-test (!uwp), boost-thread (!uwp), boost-throw-exception, boost-timer, boost-tokenizer, boost-tti, boost-tuple, boost-typeof, boost-type-erasure (!uwp), boost-type-index, boost-type-traits, boost-units, boost-unordered, boost-utility, boost-uuid, boost-variant, boost-vmd, boost-wave (!uwp), boost-winapi, boost-xpressive

+

+Feature: mpi

+Description: Build with MPI support

+Build-Depends: boost-mpi

diff --git a/ports/boost/desktop/user-config.jam b/ports/boost/desktop/user-config.jam
index 8faba6d72..311cc8951 100644
--- a/ports/boost/desktop/user-config.jam
+++ b/ports/boost/desktop/user-config.jam
@@ -5,3 +5,34 @@ using msvc : 14.0 : cl.exe :
 using msvc : 14.1 : cl.exe :
 <setup>echo
 ;
+
+using python : @PYTHON_VERSION@ : : "@PYTHON_INCLUDE_PATH@" : "@PYTHONLIBS_RELEASE@" ;
+using python : @PYTHON_VERSION@ : : "@PYTHON_INCLUDE_PATH@" : "@PYTHONLIBS_DEBUG@" : <python-debugging>on ;
+
+project user-config ;
+lib advapi32 ;
+lib icuuc : : <search>"@CURRENT_INSTALLED_DIR@/lib" : :
+              <runtime-link>"@LIB_RUNTIME_LINK@"
+              <library>advapi32 ;
+
+lib icuuc : : <search>"@CURRENT_INSTALLED_DIR@/debug/lib"
+              <variant>debug
+              <name>icuucd : :
+              <runtime-link>"@LIB_RUNTIME_LINK@"
+              <library>advapi32 ;
+
+lib icuin : : <search>"@CURRENT_INSTALLED_DIR@/lib" : :
+              <runtime-link>"@LIB_RUNTIME_LINK@" ;
+
+lib icuin : : <search>"@CURRENT_INSTALLED_DIR@/debug/lib"
+              <variant>debug
+              <name>icuind : :
+              <runtime-link>"@LIB_RUNTIME_LINK@" ;
+
+lib icudt : : <search>"@CURRENT_INSTALLED_DIR@/lib" : :
+              <runtime-link>"@LIB_RUNTIME_LINK@" ;
+
+lib icudt : : <search>"@CURRENT_INSTALLED_DIR@/debug/lib"
+              <variant>debug
+              <name>icudtd : :
+              <runtime-link>"@LIB_RUNTIME_LINK@" ;
\ No newline at end of file
diff --git a/ports/boost/portfile.cmake b/ports/boost/portfile.cmake
index 79c2f02da..0283a2085 100644
--- a/ports/boost/portfile.cmake
+++ b/ports/boost/portfile.cmake
@@ -1,294 +1,2 @@
-include(vcpkg_common_functions)
-set(VERSION 1_64)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/boost_${VERSION}_0)
-
-######################
-# Acquire and arrange sources
-######################
-vcpkg_download_distfile(ARCHIVE_FILE
-    URLS "https://sourceforge.net/projects/boost/files/boost/1.64.0/boost_${VERSION}_0.tar.bz2"
-    FILENAME "boost_${VERSION}_0.tar.bz2"
-    SHA512 68477f148f61be617552ef48559c5c2cb90d42264cabd6d5e87215d0d5024b48fca27c4afcfc1f77e490c6220d44fb1abdf0a53703867a2e4132c2857f69fedf
-)
-vcpkg_extract_source_archive(${ARCHIVE_FILE})
-
-# apply boost range hotfix
-vcpkg_download_distfile(DIFF
-    URLS "https://github.com/boostorg/range/commit/e7ebe14707130cda7b72e0ae5e93b17157fdb6a2.diff"
-    FILENAME "boost-range-has_range_iterator-hotfix_e7ebe14707130cda7b72e0ae5e93b17157fdb6a2.diff"
-    SHA512 77dad42bfd9bbab2bbddf361d5b7ad3dd6f812f4294c6dd1a677bb4d0191a4fff43bca32fdd4fce05d428562abb6e38afd0fd33ca6a8b5f28481d70cd2f3dd67
-)
-
-FILE(READ "${DIFF}" content)
-STRING(REGEX REPLACE "include/" "" content "${content}")
-set(DIFF2 ${CURRENT_BUILDTREES_DIR}/src/boost-range-has_range_iterator-hotfix_e7ebe14707130cda7b72e0ae5e93b17157fdb6a2.diff.fixed)
-FILE(WRITE ${DIFF2} "${content}")
-vcpkg_apply_patches(SOURCE_PATH ${SOURCE_PATH} PATCHES ${DIFF2})
-
-######################
-# Cleanup previous builds
-######################
-file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel)
-if(EXISTS ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel)
-    # It is possible for a file in this folder to be locked due to antivirus or vctip
-    execute_process(COMMAND ${CMAKE_COMMAND} -E sleep 1)
-    file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel)
-    if(EXISTS ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel)
-        message(FATAL_ERROR "Unable to remove directory: ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel\n  Files are likely in use.")
-    endif()
-endif()
-
-file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg)
-if(EXISTS ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg)
-    # It is possible for a file in this folder to be locked due to antivirus or vctip
-    execute_process(COMMAND ${CMAKE_COMMAND} -E sleep 1)
-    file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg)
-    if(EXISTS ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg)
-        message(FATAL_ERROR "Unable to remove directory: ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg\n  Files are likely in use.")
-    endif()
-endif()
-
-if(EXISTS ${CURRENT_PACKAGES_DIR}/debug)
-    message(FATAL_ERROR "Error: directory exists: ${CURRENT_PACKAGES_DIR}/debug\n  The previous package was not fully cleared. This is an internal error.")
-endif()
-file(MAKE_DIRECTORY
-    ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg
-    ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel)
-
-######################
-# Bootstrap b2
-######################
-if(NOT EXISTS ${SOURCE_PATH}/b2.exe)
-    message(STATUS "Bootstrapping")
-    vcpkg_execute_required_process(
-        COMMAND "${SOURCE_PATH}/bootstrap.bat"
-        WORKING_DIRECTORY ${SOURCE_PATH}
-        LOGNAME bootstrap
-    )
-endif()
-message(STATUS "Bootstrapping done")
-
-######################
-# Generate configuration
-######################
-set(B2_OPTIONS
-    -sZLIB_INCLUDE="${CURRENT_INSTALLED_DIR}\\include"
-    -sBZIP2_INCLUDE="${CURRENT_INSTALLED_DIR}\\include"
-    -j$ENV{NUMBER_OF_PROCESSORS}
-    --debug-configuration
-    --hash
-    -q
-
-    --without-python
-    threading=multi
-)
-
-if (VCPKG_CRT_LINKAGE STREQUAL dynamic)
-    list(APPEND B2_OPTIONS runtime-link=shared)
-else()
-    list(APPEND B2_OPTIONS runtime-link=static)
-endif()
-
-if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-    list(APPEND B2_OPTIONS link=shared)
-else()
-    list(APPEND B2_OPTIONS link=static)
-endif()
-
-if(TRIPLET_SYSTEM_ARCH MATCHES "x64")
-    list(APPEND B2_OPTIONS address-model=64)
-endif()
-
-if(VCPKG_CMAKE_SYSTEM_NAME MATCHES "WindowsStore")
-    list(APPEND B2_OPTIONS
-        windows-api=store
-        # --without-atomic
-        # --without-chrono
-        # --without-system
-        # --without-date_time
-        # --without-exception
-        # --without-serialization
-        # --without-fiber
-        # --without-context
-        # --without-graph_parallel
-        # --without-signals
-        # --without-coroutine2
-        # --without-graph
-        # --without-math
-        # --without-random
-        # --without-regex
-        ################################
-        --without-type_erasure # depends on thread
-        --without-log # depends on filesystem
-        --without-mpi # Needs "using mpi ;"
-        --without-wave # depends on filesystem
-        --without-coroutine # depends on thread
-        --without-metaparse # depends on test
-        --without-locale # libs\locale\src\encoding\wconv_codepage.ipp(114): error C3861: 'IsDBCSLeadByteEx': identifier not found
-        --without-timer # libs\timer\src\cpu_timer.cpp(126): error C2039: 'GetProcessTimes': is not a member of '`global namespace''
-        --without-program_options # libs\program_options\src\parsers.cpp(194): error C2065: 'environ': undeclared identifier
-
-        --without-test
-        --without-filesystem # libs\filesystem\src\operations.cpp(178): error C2039: 'GetEnvironmentVariableW': is not a member of '`global namespace''
-        --without-thread
-        --without-iostreams
-        --without-container
-    )
-    if(VCPKG_PLATFORM_TOOLSET MATCHES "v141")
-        find_path(PATH_TO_CL cl.exe)
-        find_path(PLATFORM_WINMD_DIR platform.winmd PATHS "${PATH_TO_CL}/../../../lib/x86/store/references" NO_DEFAULT_PATH)
-        if(PLATFORM_WINMD_DIR MATCHES "NOTFOUND")
-            message(FATAL_ERROR "Could not find `platform.winmd` in VS2017. Do you have the Universal Windows Platform development workload installed?")
-        endif()
-    else()
-        find_path(PLATFORM_WINMD_DIR platform.winmd PATHS "$ENV{VS140COMNTOOLS}/../../VC/LIB/store/references")
-        if(PLATFORM_WINMD_DIR MATCHES "NOTFOUND")
-            message(FATAL_ERROR "Could not find `platform.winmd` in VS2015.")
-        endif()
-    endif()
-    file(TO_NATIVE_PATH "${PLATFORM_WINMD_DIR}" PLATFORM_WINMD_DIR)
-    string(REPLACE "\\" "\\\\" PLATFORM_WINMD_DIR ${PLATFORM_WINMD_DIR}) # escape backslashes
-    configure_file(${CMAKE_CURRENT_LIST_DIR}/uwp/user-config.jam ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/user-config.jam ESCAPE_QUOTES @ONLY)
-    configure_file(${CMAKE_CURRENT_LIST_DIR}/uwp/user-config.jam ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/user-config.jam ESCAPE_QUOTES @ONLY)
-else()
-    configure_file(${CMAKE_CURRENT_LIST_DIR}/desktop/user-config.jam ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/user-config.jam @ONLY)
-    configure_file(${CMAKE_CURRENT_LIST_DIR}/desktop/user-config.jam ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/user-config.jam @ONLY)
-endif()
-
-if(VCPKG_PLATFORM_TOOLSET MATCHES "v141")
-    list(APPEND B2_OPTIONS toolset=msvc-14.1)
-elseif(VCPKG_PLATFORM_TOOLSET MATCHES "v140")
-    list(APPEND B2_OPTIONS toolset=msvc-14.0)
-else()
-    message(FATAL_ERROR "Unsupported value for VCPKG_PLATFORM_TOOLSET: '${VCPKG_PLATFORM_TOOLSET}'")
-endif()
-
-# Add build type specific options
-set(B2_OPTIONS_DBG
-    ${B2_OPTIONS}
-    -sZLIB_BINARY=zlibd
-    -sZLIB_LIBPATH="${CURRENT_INSTALLED_DIR}\\debug\\lib"
-    -sBZIP2_BINARY=bz2d
-    -sBZIP2_LIBPATH="${CURRENT_INSTALLED_DIR}\\debug\\lib"
-)
-
-set(B2_OPTIONS_REL
-    ${B2_OPTIONS}
-    -sZLIB_BINARY=zlib
-    -sZLIB_LIBPATH="${CURRENT_INSTALLED_DIR}\\lib"
-    -sBZIP2_BINARY=bz2
-    -sBZIP2_LIBPATH="${CURRENT_INSTALLED_DIR}\\lib"
-)
-
-######################
-# Perform build + Package
-######################
-message(STATUS "Building ${TARGET_TRIPLET}-rel")
-set(ENV{BOOST_BUILD_PATH} ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel)
-vcpkg_execute_required_process_repeat(
-    COUNT 2
-    COMMAND "${SOURCE_PATH}/b2.exe"
-        --stagedir=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/stage
-        --build-dir=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel
-        ${B2_OPTIONS_REL}
-        variant=release
-        debug-symbols=on
-    WORKING_DIRECTORY ${SOURCE_PATH}
-    LOGNAME build-${TARGET_TRIPLET}-rel
-)
-message(STATUS "Building ${TARGET_TRIPLET}-rel done")
-message(STATUS "Building ${TARGET_TRIPLET}-dbg")
-set(ENV{BOOST_BUILD_PATH} ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg)
-vcpkg_execute_required_process_repeat(
-    COUNT 2
-    COMMAND "${SOURCE_PATH}/b2.exe"
-        --stagedir=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/stage
-        --build-dir=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg
-        ${B2_OPTIONS_DBG}
-        variant=debug
-    WORKING_DIRECTORY ${SOURCE_PATH}
-    LOGNAME build-${TARGET_TRIPLET}-dbg
-)
-message(STATUS "Building ${TARGET_TRIPLET}-dbg done")
-
-message(STATUS "Packaging headers")
-file(
-    COPY ${SOURCE_PATH}/boost
-    DESTINATION ${CURRENT_PACKAGES_DIR}/include
-)
-
-# Disable Boost auto-link.
-file(APPEND ${CURRENT_PACKAGES_DIR}/include/boost/config/user.hpp
-	"\n#define BOOST_ALL_NO_LIB\n"
-)
-
-if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-    file(APPEND ${CURRENT_PACKAGES_DIR}/include/boost/config/user.hpp
-        "\n#define BOOST_ALL_DYN_LINK\n"
-    )
-endif()
-
-file(INSTALL ${SOURCE_PATH}/LICENSE_1_0.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/boost RENAME copyright)
-message(STATUS "Packaging headers done")
-
-# This function makes the static build lib names match the dynamic build lib names which FindBoost.cmake is looking for by default.
-# It also renames a couple of "libboost" lib files in the dynamic build (for example libboost_exception-vc140-mt-1_63.lib).
-function(boost_rename_libs LIBS)
-    foreach(LIB ${${LIBS}})
-        get_filename_component(OLD_FILENAME ${LIB} NAME)
-        get_filename_component(DIRECTORY_OF_LIB_FILE ${LIB} DIRECTORY)
-        string(REPLACE "libboost_" "boost_" NEW_FILENAME ${OLD_FILENAME})
-        string(REPLACE "-s-" "-" NEW_FILENAME ${NEW_FILENAME}) # For Release libs
-        string(REPLACE "-vc141-" "-vc140-" NEW_FILENAME ${NEW_FILENAME}) # To merge VS2017 and VS2015 binaries
-        string(REPLACE "-sgd-" "-gd-" NEW_FILENAME ${NEW_FILENAME}) # For Debug libs
-        if ("${DIRECTORY_OF_LIB_FILE}/${NEW_FILENAME}" STREQUAL "${DIRECTORY_OF_LIB_FILE}/${OLD_FILENAME}")
-            # nothing to do
-        elseif (EXISTS ${DIRECTORY_OF_LIB_FILE}/${NEW_FILENAME})
-            file(REMOVE ${DIRECTORY_OF_LIB_FILE}/${OLD_FILENAME})
-        else()
-            file(RENAME ${DIRECTORY_OF_LIB_FILE}/${OLD_FILENAME} ${DIRECTORY_OF_LIB_FILE}/${NEW_FILENAME})
-        endif()
-    endforeach()
-endfunction()
-
-message(STATUS "Packaging ${TARGET_TRIPLET}-rel")
-file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/stage/lib/
-    DESTINATION ${CURRENT_PACKAGES_DIR}/lib
-    FILES_MATCHING PATTERN "*.lib")
-if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-    file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/stage/lib/
-        DESTINATION ${CURRENT_PACKAGES_DIR}/bin
-        FILES_MATCHING PATTERN "*.dll")
-endif()
-file(GLOB RELEASE_LIBS ${CURRENT_PACKAGES_DIR}/lib/*.lib)
-boost_rename_libs(RELEASE_LIBS)
-if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/boost_test_exec_monitor-vc140-mt-${VERSION}.lib)
-    file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/lib/manual-link)
-    file(RENAME
-        ${CURRENT_PACKAGES_DIR}/lib/boost_test_exec_monitor-vc140-mt-${VERSION}.lib
-        ${CURRENT_PACKAGES_DIR}/lib/manual-link/boost_test_exec_monitor-vc140-mt-${VERSION}.lib
-    )
-endif()
-message(STATUS "Packaging ${TARGET_TRIPLET}-rel done")
-
-message(STATUS "Packaging ${TARGET_TRIPLET}-dbg")
-file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/stage/lib/
-    DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib
-    FILES_MATCHING PATTERN "*.lib")
-if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-    file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/stage/lib/
-        DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin
-        FILES_MATCHING PATTERN "*.dll")
-endif()
-file(GLOB DEBUG_LIBS ${CURRENT_PACKAGES_DIR}/debug/lib/*.lib)
-boost_rename_libs(DEBUG_LIBS)
-if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/lib/boost_test_exec_monitor-vc140-mt-gd-${VERSION}.lib)
-    file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link)
-    file(RENAME
-        ${CURRENT_PACKAGES_DIR}/debug/lib/boost_test_exec_monitor-vc140-mt-gd-${VERSION}.lib
-        ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/boost_test_exec_monitor-vc140-mt-gd-${VERSION}.lib
-    )
-endif()
-message(STATUS "Packaging ${TARGET_TRIPLET}-dbg done")
-
-vcpkg_copy_pdbs()
+set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
+

diff --git a/ports/boost/usage b/ports/boost/usage
new file mode 100644
index 000000000..28d429010
--- /dev/null
+++ b/ports/boost/usage
@@ -0,0 +1,5 @@
+The package boost is compatible with built-in CMake targets:

+

+    find_package(Boost REQUIRED [COMPONENTS <libs>...])

+    target_link_libraries(main PRIVATE ${Boost_LIBRARIES})

+    target_include_directories(main PRIVATE ${Boost_INCLUDE_DIRS})

diff --git a/ports/boost/uwp/user-config.jam b/ports/boost/uwp/user-config.jam
index 88e7c5974..975b1d412 100644
--- a/ports/boost/uwp/user-config.jam
+++ b/ports/boost/uwp/user-config.jam
@@ -13,3 +13,11 @@ using msvc : 14.1 : cl.exe :
 <linkflags>RuntimeObject.lib
 <linkflags>ole32.lib
 ;
+
+project user-config ;
+              
+lib icuuc : : <name>dummy_lib_that_doesnt_exist ;
+                            
+lib icuin : : <name>dummy_lib_that_doesnt_exist ;
+              
+lib icudt : : <name>dummy_lib_that_doesnt_exist ;
\ No newline at end of file