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

In debug configuration, link boost with debug Python libraries instead of release ones

Browse Source
This commit is contained in:
Martin Müller 2017-07-14 23:07:55 +02:00
parent 1304b77202
commit d88f53de9c
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
ports/boost/portfile.cmake
View File

@ -93,6 +93,21 @@ set(B2_OPTIONS
threading=multi threading=multi
) )
# Add build type specific options
set(B2_OPTIONS_DBG
-sZLIB_BINARY=zlibd
-sZLIB_LIBPATH="${CURRENT_INSTALLED_DIR}\\debug\\lib"
-sBZIP2_BINARY=bz2d
-sBZIP2_LIBPATH="${CURRENT_INSTALLED_DIR}\\debug\\lib"
)
set(B2_OPTIONS_REL
-sZLIB_BINARY=zlib
-sZLIB_LIBPATH="${CURRENT_INSTALLED_DIR}\\lib"
-sBZIP2_BINARY=bz2
-sBZIP2_LIBPATH="${CURRENT_INSTALLED_DIR}\\lib"
)
set(LIB_RUNTIME_LINK "shared") set(LIB_RUNTIME_LINK "shared")
if (VCPKG_CRT_LINKAGE STREQUAL dynamic) if (VCPKG_CRT_LINKAGE STREQUAL dynamic)
list(APPEND B2_OPTIONS runtime-link=shared) list(APPEND B2_OPTIONS runtime-link=shared)
@ -172,6 +187,8 @@ else()
string(REGEX REPLACE ".*python([0-9\.]+)$" "\\1" PYTHON_VERSION ${PYTHON_INCLUDE_PATH}) string(REGEX REPLACE ".*python([0-9\.]+)$" "\\1" PYTHON_VERSION ${PYTHON_INCLUDE_PATH})
configure_file(${CMAKE_CURRENT_LIST_DIR}/desktop/user-config.jam ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/user-config.jam @ONLY) configure_file(${CMAKE_CURRENT_LIST_DIR}/desktop/user-config.jam ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/user-config.jam @ONLY)
configure_file(${CMAKE_CURRENT_LIST_DIR}/desktop/user-config.jam ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/user-config.jam @ONLY) configure_file(${CMAKE_CURRENT_LIST_DIR}/desktop/user-config.jam ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/user-config.jam @ONLY)
list(APPEND B2_OPTIONS_DBG
python-debugging=on)
endif() endif()
if(VCPKG_PLATFORM_TOOLSET MATCHES "v141") if(VCPKG_PLATFORM_TOOLSET MATCHES "v141")
@ -182,21 +199,14 @@ else()
message(FATAL_ERROR "Unsupported value for VCPKG_PLATFORM_TOOLSET: '${VCPKG_PLATFORM_TOOLSET}'") message(FATAL_ERROR "Unsupported value for VCPKG_PLATFORM_TOOLSET: '${VCPKG_PLATFORM_TOOLSET}'")
endif() endif()
# Add build type specific options
set(B2_OPTIONS_DBG set(B2_OPTIONS_DBG
${B2_OPTIONS} ${B2_OPTIONS}
-sZLIB_BINARY=zlibd ${B2_OPTIONS_DBG}
-sZLIB_LIBPATH="${CURRENT_INSTALLED_DIR}\\debug\\lib"
-sBZIP2_BINARY=bz2d
-sBZIP2_LIBPATH="${CURRENT_INSTALLED_DIR}\\debug\\lib"
) )
set(B2_OPTIONS_REL set(B2_OPTIONS_REL
${B2_OPTIONS} ${B2_OPTIONS}
-sZLIB_BINARY=zlib ${B2_OPTIONS_REL}
-sZLIB_LIBPATH="${CURRENT_INSTALLED_DIR}\\lib"
-sBZIP2_BINARY=bz2
-sBZIP2_LIBPATH="${CURRENT_INSTALLED_DIR}\\lib"
) )
###################### ######################