diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2016-12-14 12:24:31 -0800 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2016-12-14 12:24:31 -0800 |
| commit | fdbfee0aeb90749b30dfe29cf6b5c817c26fb5da (patch) | |
| tree | 3074bae690380ee138cec634ffb008895f0ed110 | |
| parent | b1681d0838fdc3a3bd361e5678d23d2376a3edbd (diff) | |
| parent | 447995519319c80cefd0c612c49aa005ab2586d3 (diff) | |
| download | vcpkg-fdbfee0aeb90749b30dfe29cf6b5c817c26fb5da.tar.gz vcpkg-fdbfee0aeb90749b30dfe29cf6b5c817c26fb5da.zip | |
Merge branch 'boost_with_zlib' of https://github.com/mmassing/vcpkg into mmassing-boost_with_zlib
| -rw-r--r-- | ports/boost/CONTROL | 1 | ||||
| -rw-r--r-- | ports/boost/portfile.cmake | 17 |
2 files changed, 16 insertions, 2 deletions
diff --git a/ports/boost/CONTROL b/ports/boost/CONTROL index 52273d80e..ab7f87cc1 100644 --- a/ports/boost/CONTROL +++ b/ports/boost/CONTROL @@ -1,3 +1,4 @@ Source: boost Version: 1.62-8 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 |