From a3aeb99092e8dabe1e3bed020be23d60df1787cf Mon Sep 17 00:00:00 2001 From: Manuel Massing Date: Mon, 9 Jan 2017 11:03:56 +0100 Subject: [boost] Fix zlib detection in debug build --- ports/boost/portfile.cmake | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/ports/boost/portfile.cmake b/ports/boost/portfile.cmake index 0e25f34bc..5c272e9cc 100644 --- a/ports/boost/portfile.cmake +++ b/ports/boost/portfile.cmake @@ -31,9 +31,7 @@ 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 @@ -65,12 +63,15 @@ if(VCPKG_CMAKE_SYSTEM_NAME MATCHES "WindowsStore") endif() # Add build type specific options -set(B2_OPTIONS_DBG - ${B2_OPTIONS} +set(B2_OPTIONS_DBG + ${B2_OPTIONS} + -sZLIB_BINARY=zlibd -sZLIB_LIBPATH="${CURRENT_INSTALLED_DIR}\\debug\\lib" ) -set(B2_OPTIONS_REL - ${B2_OPTIONS} + +set(B2_OPTIONS_REL + ${B2_OPTIONS} + -sZLIB_BINARY=zlib -sZLIB_LIBPATH="${CURRENT_INSTALLED_DIR}\\lib" ) -- cgit v1.2.3