3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-28 19:25:27 +08:00
Code Issues Projects Releases Wiki Activity

[boost] Fix uwp builds. Add x86-uwp to CI.

Browse Source 
Fixes #1069.
This commit is contained in:
Robert Schumacher 2017-05-14 19:55:43 -07:00
parent 8379a80abe
commit 74c2c23c13
4 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/boost/CONTROL
View File

@ -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

24
ports/boost/portfile.cmake
View File

@ -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()

8
ports/boost/uwp/user-config.jam
View File

@ -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
;

2
scripts/internalCI.ps1
View File

@ -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