diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-01-12 16:46:47 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-12 16:46:47 -0800 |
| commit | 5a3881a083b475adbace2097a1c3a62e1d3627f3 (patch) | |
| tree | ece14447c7369f8df6d7fce912db6ede55b28846 | |
| parent | f9709aae5f1e7cac75672bb3ba78f45ebd09396b (diff) | |
| parent | 59c34be2526059ebd3e485ee03f2f3d3c86c05b0 (diff) | |
| download | vcpkg-5a3881a083b475adbace2097a1c3a62e1d3627f3.tar.gz vcpkg-5a3881a083b475adbace2097a1c3a62e1d3627f3.zip | |
Merge pull request #484 from chrullrich/boost-no-autolink
Disable Boost auto-link.
| -rw-r--r-- | ports/boost/CONTROL | 2 | ||||
| -rw-r--r-- | ports/boost/portfile.cmake | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/ports/boost/CONTROL b/ports/boost/CONTROL index 9e2afdf8a..01d6e9858 100644 --- a/ports/boost/CONTROL +++ b/ports/boost/CONTROL @@ -1,4 +1,4 @@ Source: boost -Version: 1.62-9 +Version: 1.62-10 Description: Peer-reviewed portable C++ source libraries Build-Depends: zlib diff --git a/ports/boost/portfile.cmake b/ports/boost/portfile.cmake index 6cc21a091..3fbd06982 100644 --- a/ports/boost/portfile.cmake +++ b/ports/boost/portfile.cmake @@ -108,11 +108,10 @@ file( DESTINATION ${CURRENT_PACKAGES_DIR}/include ) -if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - file(APPEND ${CURRENT_PACKAGES_DIR}/include/boost/config/user.hpp - "\n#define BOOST_ALL_DYN_LINK\n" - ) -endif() +# Disable Boost auto-link. +file(APPEND ${CURRENT_PACKAGES_DIR}/include/boost/config/user.hpp + "\n#define BOOST_ALL_NO_LIB\n" +) file(INSTALL ${SOURCE_PATH}/LICENSE_1_0.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/boost RENAME copyright) message(STATUS "Packaging headers done") |