aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorManuel Massing <Manuel Massing m.massing@warped-space.de>2017-01-09 11:03:56 +0100
committerManuel Massing <Manuel Massing m.massing@warped-space.de>2017-01-25 08:56:36 +0100
commita3aeb99092e8dabe1e3bed020be23d60df1787cf (patch)
tree302e89a43b874654488b57e1af2a301256e75905
parent9b8afccc9db0959cb3a47d77fd0255096011e245 (diff)
downloadvcpkg-a3aeb99092e8dabe1e3bed020be23d60df1787cf.tar.gz
vcpkg-a3aeb99092e8dabe1e3bed020be23d60df1787cf.zip
[boost] Fix zlib detection in debug build
-rw-r--r--ports/boost/portfile.cmake13
1 files 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"
)