aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Karatarakis <alex@karatarakis.com>2017-01-17 11:43:59 -0800
committerGitHub <noreply@github.com>2017-01-17 11:43:59 -0800
commit5d302f9f8e5c26c620fd7189f099404141779f6e (patch)
tree3f895194189f6d560320508856dca8a8d9753244
parent60b0eb3da4db83658e1075c0b1b15cfa7f506c53 (diff)
parentbc874e3db23709c54e0c32c31d9d72ff263edbcb (diff)
downloadvcpkg-5d302f9f8e5c26c620fd7189f099404141779f6e.tar.gz
vcpkg-5d302f9f8e5c26c620fd7189f099404141779f6e.zip
Merge pull request #555 from chrullrich/boost-dyn-link
Fix Boost dynamic build I recently broke.
-rw-r--r--ports/boost/CONTROL2
-rw-r--r--ports/boost/portfile.cmake6
2 files changed, 7 insertions, 1 deletions
diff --git a/ports/boost/CONTROL b/ports/boost/CONTROL
index 01d6e9858..0abbac659 100644
--- a/ports/boost/CONTROL
+++ b/ports/boost/CONTROL
@@ -1,4 +1,4 @@
Source: boost
-Version: 1.62-10
+Version: 1.62-11
Description: Peer-reviewed portable C++ source libraries
Build-Depends: zlib
diff --git a/ports/boost/portfile.cmake b/ports/boost/portfile.cmake
index 3fbd06982..0e25f34bc 100644
--- a/ports/boost/portfile.cmake
+++ b/ports/boost/portfile.cmake
@@ -113,6 +113,12 @@ file(APPEND ${CURRENT_PACKAGES_DIR}/include/boost/config/user.hpp
"\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)
message(STATUS "Packaging headers done")