diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-10-27 23:55:48 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2017-10-27 23:55:48 -0700 |
| commit | da04e942f2878b360f146a2751480c3133e3b817 (patch) | |
| tree | ff8f4b13c7ed8a38fed6358b88909f3179198f6e | |
| parent | a7f3ab84f024fbf3a1f0c66fd1c5915bdcb5cd2e (diff) | |
| download | vcpkg-da04e942f2878b360f146a2751480c3133e3b817.tar.gz vcpkg-da04e942f2878b360f146a2751480c3133e3b817.zip | |
[boost] Only define BOOST_ALL_NO_LIB if not already defined. Fixes #2061.
| -rw-r--r-- | ports/boost/CONTROL | 2 | ||||
| -rw-r--r-- | ports/boost/portfile.cmake | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ports/boost/CONTROL b/ports/boost/CONTROL index 55c32a280..c07369e2e 100644 --- a/ports/boost/CONTROL +++ b/ports/boost/CONTROL @@ -1,5 +1,5 @@ Source: boost -Version: 1.65.1-2 +Version: 1.65.1-3 Description: Peer-reviewed portable C++ source libraries Build-Depends: zlib, bzip2 diff --git a/ports/boost/portfile.cmake b/ports/boost/portfile.cmake index 57dc081da..a14172452 100644 --- a/ports/boost/portfile.cmake +++ b/ports/boost/portfile.cmake @@ -258,7 +258,7 @@ file( # Disable Boost auto-link. file(APPEND ${CURRENT_PACKAGES_DIR}/include/boost/config/user.hpp - "\n#define BOOST_ALL_NO_LIB\n" + "\n#ifndef BOOST_ALL_NO_LIB\n#define BOOST_ALL_NO_LIB\n#endif\n" ) file(APPEND ${CURRENT_PACKAGES_DIR}/include/boost/config/user.hpp "\n#undef BOOST_ALL_DYN_LINK\n" |