diff options
| author | Manuel Massing <m.massing@warped-space.de> | 2016-11-25 15:58:57 +0100 |
|---|---|---|
| committer | Manuel Massing <m.massing@warped-space.de> | 2016-11-25 15:58:57 +0100 |
| commit | 447995519319c80cefd0c612c49aa005ab2586d3 (patch) | |
| tree | 70d8e8d40ac28f156dcf644a50064aa4c6a81573 | |
| parent | 8e911397c5a7e9796714431e9f87787dfd234fcc (diff) | |
| download | vcpkg-447995519319c80cefd0c612c49aa005ab2586d3.tar.gz vcpkg-447995519319c80cefd0c612c49aa005ab2586d3.zip | |
[boost] Link against correct version of zlib when building debug variant.
| -rw-r--r-- | ports/boost/portfile.cmake | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/ports/boost/portfile.cmake b/ports/boost/portfile.cmake index 5b488c697..050418afc 100644 --- a/ports/boost/portfile.cmake +++ b/ports/boost/portfile.cmake @@ -65,6 +65,15 @@ if(TRIPLET_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) @@ -74,7 +83,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} @@ -87,7 +96,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 |