aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Karatarakis <alkarata@microsoft.com>2016-11-15 11:54:02 -0800
committerAlexander Karatarakis <alkarata@microsoft.com>2016-11-15 11:54:02 -0800
commita72be4b6b9b63a7a11f507782c1c26fdd2b18ad0 (patch)
treeb8b06a09b55ac983b80b067553b69041d70a27e8
parent70c4cbce771de2930f5be53f57db74b6f5b5eb65 (diff)
downloadvcpkg-a72be4b6b9b63a7a11f507782c1c26fdd2b18ad0.tar.gz
vcpkg-a72be4b6b9b63a7a11f507782c1c26fdd2b18ad0.zip
[boost] The #define BOOST_ALL_DYN_LINK should be added only in dynamic linkage
-rw-r--r--ports/boost/CONTROL2
-rw-r--r--ports/boost/portfile.cmake14
2 files changed, 8 insertions, 8 deletions
diff --git a/ports/boost/CONTROL b/ports/boost/CONTROL
index 4e8647516..5d074197e 100644
--- a/ports/boost/CONTROL
+++ b/ports/boost/CONTROL
@@ -1,3 +1,3 @@
Source: boost
-Version: 1.62-2
+Version: 1.62-3
Description: Peer-reviewed portable C++ source libraries
diff --git a/ports/boost/portfile.cmake b/ports/boost/portfile.cmake
index 75a388956..5f9b29c32 100644
--- a/ports/boost/portfile.cmake
+++ b/ports/boost/portfile.cmake
@@ -90,14 +90,14 @@ message(STATUS "Packaging headers")
file(
COPY ${SOURCE_PATH}/boost
DESTINATION ${CURRENT_PACKAGES_DIR}/include
- PATTERN "config/user.hpp" EXCLUDE
-)
-file(COPY ${SOURCE_PATH}/boost/config/user.hpp
- DESTINATION ${CURRENT_PACKAGES_DIR}/include/boost/config/
-)
-file(APPEND ${CURRENT_PACKAGES_DIR}/include/boost/config/user.hpp
- "\n#define BOOST_ALL_DYN_LINK\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")