diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-11-30 22:20:06 -0800 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2017-11-30 22:20:06 -0800 |
| commit | c8c332c8935e0141f4fcb074b511e77e649f0bd9 (patch) | |
| tree | b05e1751c0f3eb74425a95b4d4629edf80fd4ec8 /ports | |
| parent | 03ff483446cc1772415cc1bf2104a9fe99dd5a18 (diff) | |
| parent | f174d5561af49cccbfb4d9618be123cf7ee971d6 (diff) | |
| download | vcpkg-c8c332c8935e0141f4fcb074b511e77e649f0bd9.tar.gz vcpkg-c8c332c8935e0141f4fcb074b511e77e649f0bd9.zip | |
Merge branch 'master' of https://github.com/Microsoft/vcpkg
Diffstat (limited to 'ports')
| -rw-r--r-- | ports/libsodium/portfile.cmake | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/ports/libsodium/portfile.cmake b/ports/libsodium/portfile.cmake index 4e6cd6be7..c781fb1fb 100644 --- a/ports/libsodium/portfile.cmake +++ b/ports/libsodium/portfile.cmake @@ -37,19 +37,22 @@ file(INSTALL DESTINATION ${CURRENT_PACKAGES_DIR}/include/sodium ) -file(INSTALL - ${SOURCE_PATH}/Build/${LIBSODIUM_RELEASE_CONFIGURATION}/${BUILD_ARCH}/libsodium.dll - DESTINATION ${CURRENT_PACKAGES_DIR}/bin -) +if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + file(INSTALL + ${SOURCE_PATH}/Build/${LIBSODIUM_RELEASE_CONFIGURATION}/${BUILD_ARCH}/libsodium.dll + DESTINATION ${CURRENT_PACKAGES_DIR}/bin + ) + file(INSTALL + ${SOURCE_PATH}/Build/${LIBSODIUM_DEBUG_CONFIGURATION}/${BUILD_ARCH}/libsodium.dll + DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin + ) +endif() + file(INSTALL ${SOURCE_PATH}/Build/${LIBSODIUM_RELEASE_CONFIGURATION}/${BUILD_ARCH}/libsodium.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib ) file(INSTALL - ${SOURCE_PATH}/Build/${LIBSODIUM_DEBUG_CONFIGURATION}/${BUILD_ARCH}/libsodium.dll - DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin -) -file(INSTALL ${SOURCE_PATH}/Build/${LIBSODIUM_DEBUG_CONFIGURATION}/${BUILD_ARCH}/libsodium.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib ) |