diff options
| author | Alexander Karatarakis <alex@karatarakis.com> | 2017-01-25 12:46:37 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-25 12:46:37 -0800 |
| commit | e4b102e6cecfe8b5fe35cf0ddc6fc29d22afa927 (patch) | |
| tree | 65707c457981b20e01cf9f4d3fa2a0ac794b0767 | |
| parent | a60b7086aba8bcc59389fcf4b46b8e4b3a090ce4 (diff) | |
| parent | a3aeb99092e8dabe1e3bed020be23d60df1787cf (diff) | |
| download | vcpkg-e4b102e6cecfe8b5fe35cf0ddc6fc29d22afa927.tar.gz vcpkg-e4b102e6cecfe8b5fe35cf0ddc6fc29d22afa927.zip | |
Merge pull request #588 from mmassing/boost_fix_zlib_in_debug
[boost] Fix zlib detection in debug build
| -rw-r--r-- | ports/boost/portfile.cmake | 13 |
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" ) |