Fix Boost dynamic build.

Some of the Boost libraries build differently depending on whether
BOOST_X_DYN_LINK is defined, so this symbol must be present in the
dynamic build, and removing it as part of disabling auto-link was wrong.

Reverts half of 5a3881a0.
This commit is contained in:
Christian Ullrich 2017-01-16 14:43:57 +01:00
parent 60b0eb3da4
commit bc874e3db2
2 changed files with 7 additions and 1 deletions

View File

@ -1,4 +1,4 @@
Source: boost Source: boost
Version: 1.62-10 Version: 1.62-11
Description: Peer-reviewed portable C++ source libraries Description: Peer-reviewed portable C++ source libraries
Build-Depends: zlib Build-Depends: zlib

View File

@ -113,6 +113,12 @@ file(APPEND ${CURRENT_PACKAGES_DIR}/include/boost/config/user.hpp
"\n#define BOOST_ALL_NO_LIB\n" "\n#define BOOST_ALL_NO_LIB\n"
) )
if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
file(APPEND ${CURRENT_PACKAGES_DIR}/include/boost/config/user.hpp
"\n#define BOOST_ALL_DYN_LINK\n"
)
endif()
file(INSTALL ${SOURCE_PATH}/LICENSE_1_0.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/boost RENAME copyright) file(INSTALL ${SOURCE_PATH}/LICENSE_1_0.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/boost RENAME copyright)
message(STATUS "Packaging headers done") message(STATUS "Packaging headers done")