diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-05-14 19:55:43 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2017-05-14 19:56:16 -0700 |
| commit | 74c2c23c13da7889787cb0c1c0bc857bc6122d9e (patch) | |
| tree | b486bf2dd1dfc7edb4ee5820e1d2996543b1d168 | |
| parent | 8379a80abe5288c7c06d5b9ab16efe355d1c6f62 (diff) | |
| download | vcpkg-74c2c23c13da7889787cb0c1c0bc857bc6122d9e.tar.gz vcpkg-74c2c23c13da7889787cb0c1c0bc857bc6122d9e.zip | |
[boost] Fix uwp builds. Add x86-uwp to CI.
Fixes #1069.
| -rw-r--r-- | ports/boost/CONTROL | 2 | ||||
| -rw-r--r-- | ports/boost/portfile.cmake | 24 | ||||
| -rw-r--r-- | ports/boost/uwp/user-config.jam | 8 | ||||
| -rw-r--r-- | scripts/internalCI.ps1 | 2 |
4 files changed, 22 insertions, 14 deletions
diff --git a/ports/boost/CONTROL b/ports/boost/CONTROL index 308879e46..ec2e77ffa 100644 --- a/ports/boost/CONTROL +++ b/ports/boost/CONTROL @@ -1,4 +1,4 @@ Source: boost -Version: 1.64-3 +Version: 1.64-4 Description: Peer-reviewed portable C++ source libraries Build-Depends: zlib, bzip2 diff --git a/ports/boost/portfile.cmake b/ports/boost/portfile.cmake index 1f442ac7a..79c2f02da 100644 --- a/ports/boost/portfile.cmake +++ b/ports/boost/portfile.cmake @@ -262,11 +262,13 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) endif() file(GLOB RELEASE_LIBS ${CURRENT_PACKAGES_DIR}/lib/*.lib) boost_rename_libs(RELEASE_LIBS) -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 -) +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") @@ -280,11 +282,13 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) endif() file(GLOB DEBUG_LIBS ${CURRENT_PACKAGES_DIR}/debug/lib/*.lib) boost_rename_libs(DEBUG_LIBS) -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 -) +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() diff --git a/ports/boost/uwp/user-config.jam b/ports/boost/uwp/user-config.jam index c760c7390..88e7c5974 100644 --- a/ports/boost/uwp/user-config.jam +++ b/ports/boost/uwp/user-config.jam @@ -1,11 +1,15 @@ using msvc : 14.0 : cl.exe : <setup>echo <compileflags>"\"/AI@PLATFORM_WINMD_DIR@\"" -<linkflags>/nodefaultlibs +<linkflags>kernel32.lib +<linkflags>RuntimeObject.lib +<linkflags>ole32.lib ; using msvc : 14.1 : cl.exe : <setup>echo <compileflags>"\"/AI@PLATFORM_WINMD_DIR@\"" -<linkflags>/nodefaultlibs +<linkflags>kernel32.lib +<linkflags>RuntimeObject.lib +<linkflags>ole32.lib ; diff --git a/scripts/internalCI.ps1 b/scripts/internalCI.ps1 index 1af0bb97e..bfcb93b35 100644 --- a/scripts/internalCI.ps1 +++ b/scripts/internalCI.ps1 @@ -18,7 +18,7 @@ if (-not $?) { exit $? } ./vcpkg.exe install bond chakracore cryptopp zlib expat sdl2 curl sqlite3 libuv protobuf:x64-windows sfml opencv:x64-windows if (-not $?) { exit $? } -./vcpkg.exe install opencv:x86-uwp +./vcpkg.exe install opencv:x86-uwp boost:x86-uwp if (-not $?) { exit $? } ./vcpkg.exe install folly:x64-windows |