diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2016-10-18 12:31:40 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2016-10-18 12:31:40 -0700 |
| commit | b2c33488acc4b3be7dd825e523e6028eed79b6fc (patch) | |
| tree | b9cf3abaa9d254db1c2b83a11cb3c1432d76aa40 | |
| parent | 119f1bd7a8e9ee58f38705d345df7e20fe075a3b (diff) | |
| parent | 8e69ee5eb21994343f43eebc34824e5bb5a80502 (diff) | |
| download | vcpkg-b2c33488acc4b3be7dd825e523e6028eed79b6fc.tar.gz vcpkg-b2c33488acc4b3be7dd825e523e6028eed79b6fc.zip | |
Merge branch 'master' of https://github.com/microsoft/vcpkg
| -rw-r--r-- | ports/boost/portfile.cmake | 36 |
1 files changed, 28 insertions, 8 deletions
diff --git a/ports/boost/portfile.cmake b/ports/boost/portfile.cmake index 03404b531..43dde456a 100644 --- a/ports/boost/portfile.cmake +++ b/ports/boost/portfile.cmake @@ -1,3 +1,4 @@ +include(${CMAKE_TRIPLET_FILE}) include(vcpkg_common_functions) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/boost_1_62_0) @@ -24,10 +25,21 @@ set(B2_OPTIONS -q --without-python threading=multi - link=shared - runtime-link=shared --debug-configuration ) + +if (VCPKG_CRT_LINKAGE STREQUAL dynamic) + list(APPEND B2_OPTIONS runtime-link=shared) +elseif() + list(APPEND B2_OPTIONS runtime-link=static) +endif() + +if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + list(APPEND B2_OPTIONS link=shared) +elseif() + list(APPEND B2_OPTIONS link=static) +endif() + if(TRIPLET_SYSTEM_ARCH MATCHES "x64") list(APPEND B2_OPTIONS address-model=64) endif() @@ -82,18 +94,26 @@ message(STATUS "Packaging ${TARGET_TRIPLET}-rel") file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/stage/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/lib FILES_MATCHING PATTERN "*.lib") -file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/stage/lib/ - DESTINATION ${CURRENT_PACKAGES_DIR}/bin - FILES_MATCHING PATTERN "*.dll") +if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/stage/lib/ + DESTINATION ${CURRENT_PACKAGES_DIR}/bin + FILES_MATCHING PATTERN "*.dll") +elseif() + message(STATUS ${VCPKG_LIBRARY_LINKAGE}) +endif() message(STATUS "Packaging ${TARGET_TRIPLET}-rel done") message(STATUS "Packaging ${TARGET_TRIPLET}-dbg") file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/stage/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib FILES_MATCHING PATTERN "*.lib") -file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/stage/lib/ - DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin - FILES_MATCHING PATTERN "*.dll") +if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/stage/lib/ + DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin + FILES_MATCHING PATTERN "*.dll") +elseif() + message(STATUS ${VCPKG_LIBRARY_LINKAGE}) +endif() message(STATUS "Packaging ${TARGET_TRIPLET}-dbg done") vcpkg_copy_pdbs()
\ No newline at end of file |