diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2016-12-14 14:23:11 -0800 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2016-12-14 14:23:11 -0800 |
| commit | 4300197a03a914e6f20050774a08a377cfb5ea0c (patch) | |
| tree | 38dfdf5e2a561fb65a5fb0d421b54fd67e295ae9 | |
| parent | b1681d0838fdc3a3bd361e5678d23d2376a3edbd (diff) | |
| parent | 6507a1ea321effda7c0c2ffc8cdc4982bac1b5d5 (diff) | |
| download | vcpkg-4300197a03a914e6f20050774a08a377cfb5ea0c.tar.gz vcpkg-4300197a03a914e6f20050774a08a377cfb5ea0c.zip | |
Merge branch 'mmassing-boost_with_zlib'
| -rw-r--r-- | ports/boost/CONTROL | 3 | ||||
| -rw-r--r-- | ports/boost/portfile.cmake | 17 |
2 files changed, 17 insertions, 3 deletions
diff --git a/ports/boost/CONTROL b/ports/boost/CONTROL index 52273d80e..9e2afdf8a 100644 --- a/ports/boost/CONTROL +++ b/ports/boost/CONTROL @@ -1,3 +1,4 @@ Source: boost -Version: 1.62-8 +Version: 1.62-9 Description: Peer-reviewed portable C++ source libraries +Build-Depends: zlib diff --git a/ports/boost/portfile.cmake b/ports/boost/portfile.cmake index 3c408bca7..6cc21a091 100644 --- a/ports/boost/portfile.cmake +++ b/ports/boost/portfile.cmake @@ -31,6 +31,10 @@ endif() message(STATUS "Bootstrapping done") set(B2_OPTIONS + -sZLIB_BINARY=zlib + -sZLIB_INCLUDE="${CURRENT_INSTALLED_DIR}\\include" + -sZLIB_LIBPATH="${CURRENT_INSTALLED_DIR}\\lib" + -sNO_BZIP2=1 -j$ENV{NUMBER_OF_PROCESSORS} --debug-configuration --hash @@ -60,6 +64,15 @@ if(VCPKG_CMAKE_SYSTEM_NAME MATCHES "WindowsStore") set(ENV{BOOST_BUILD_PATH} ${CMAKE_CURRENT_LIST_DIR}) endif() +# Add build type specific options +set(B2_OPTIONS_DBG + ${B2_OPTIONS} + -sZLIB_LIBPATH="${CURRENT_INSTALLED_DIR}\\debug\\lib" +) +set(B2_OPTIONS_REL + ${B2_OPTIONS} + -sZLIB_LIBPATH="${CURRENT_INSTALLED_DIR}\\lib" +) file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg) @@ -69,7 +82,7 @@ vcpkg_execute_required_process_repeat( COMMAND "${SOURCE_PATH}/b2.exe" --stagedir=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/stage --build-dir=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel - ${B2_OPTIONS} + ${B2_OPTIONS_REL} variant=release debug-symbols=on WORKING_DIRECTORY ${SOURCE_PATH} @@ -82,7 +95,7 @@ vcpkg_execute_required_process_repeat( COMMAND "${SOURCE_PATH}/b2.exe" --stagedir=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/stage --build-dir=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg - ${B2_OPTIONS} + ${B2_OPTIONS_DBG} variant=debug WORKING_DIRECTORY ${SOURCE_PATH} LOGNAME build-${TARGET_TRIPLET}-dbg |