aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Karatarakis <alkarata@microsoft.com>2016-11-09 14:46:10 -0800
committerAlexander Karatarakis <alkarata@microsoft.com>2016-11-09 14:46:10 -0800
commit083e0a611f33496714b7e31161887e8026a29411 (patch)
treea6ad727a374253c1760c4ab6f55e3e58a786e932
parent89447c156d3b99ba63499aa4b8f23b985ccd6474 (diff)
downloadvcpkg-083e0a611f33496714b7e31161887e8026a29411.tar.gz
vcpkg-083e0a611f33496714b7e31161887e8026a29411.zip
[boost] Fix portfile to properly select static library/crt linkage
-rw-r--r--ports/boost/portfile.cmake8
1 files changed, 4 insertions, 4 deletions
diff --git a/ports/boost/portfile.cmake b/ports/boost/portfile.cmake
index 586f6dfcf..cb4b6a26c 100644
--- a/ports/boost/portfile.cmake
+++ b/ports/boost/portfile.cmake
@@ -41,13 +41,13 @@ set(B2_OPTIONS
if (VCPKG_CRT_LINKAGE STREQUAL dynamic)
list(APPEND B2_OPTIONS runtime-link=shared)
-elseif()
+else()
list(APPEND B2_OPTIONS runtime-link=static)
endif()
if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
list(APPEND B2_OPTIONS link=shared)
-elseif()
+else()
list(APPEND B2_OPTIONS link=static)
endif()
@@ -109,7 +109,7 @@ 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()
+else()
message(STATUS ${VCPKG_LIBRARY_LINKAGE})
endif()
message(STATUS "Packaging ${TARGET_TRIPLET}-rel done")
@@ -122,7 +122,7 @@ 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()
+else()
message(STATUS ${VCPKG_LIBRARY_LINKAGE})
endif()
message(STATUS "Packaging ${TARGET_TRIPLET}-dbg done")