3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-26 17:41:09 +08:00
Code Issues Projects Releases Wiki Activity

Restore support for zlib and gzip in iostreams

Browse Source
This commit is contained in:
David Benson 2018-01-16 14:26:13 -07:00 committed by Robert Schumacher
parent 78ac1d0bb6
commit 9fe1006200
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ports/boost-build/boost-modular-build.cmake
View File

@ -102,10 +102,25 @@ function(boost_modular_build)
--ignore-site-config
--hash
-q
-sZLIB_INCLUDE="${CURRENT_INSTALLED_DIR}\\include"
-sBZIP2_INCLUDE="${CURRENT_INSTALLED_DIR}\\include"
threadapi=win32
threading=multi
)
set(_bm_OPTIONS_DBG
-sZLIB_BINARY=zlibd
-sZLIB_LIBPATH="${CURRENT_INSTALLED_DIR}\\debug\\lib"
-sBZIP2_BINARY=bz2d
-sBZIP2_LIBPATH="${CURRENT_INSTALLED_DIR}\\debug\\lib"
)
set(_bm_OPTIONS_REL
-sZLIB_BINARY=zlib
-sZLIB_LIBPATH="${CURRENT_INSTALLED_DIR}\\lib"
-sBZIP2_BINARY=bz2
-sBZIP2_LIBPATH="${CURRENT_INSTALLED_DIR}\\lib"
)
# Add build type specific options
if(VCPKG_CRT_LINKAGE STREQUAL "dynamic")
@ -176,6 +191,7 @@ function(boost_modular_build)
--build-dir=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel
--user-config=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/user-config.jam
${_bm_OPTIONS}
${_bm_OPTIONS_REL}
variant=release
debug-symbols=on
WORKING_DIRECTORY ${_bm_SOURCE_PATH}
@ -193,6 +209,7 @@ function(boost_modular_build)
--build-dir=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg
--user-config=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/user-config.jam
${_bm_OPTIONS}
${_bm_OPTIONS_DBG}
variant=debug
WORKING_DIRECTORY ${_bm_SOURCE_PATH}
LOGNAME build-${TARGET_TRIPLET}-dbg