diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2018-02-22 06:22:12 -0800 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-02-22 06:22:12 -0800 |
| commit | 86a652c31cba8a70eef41f999e2a6dc1be592303 (patch) | |
| tree | 8393c48e5e38cf0db9e4c841dce46befe94792d9 | |
| parent | ef9d50ecb3a968062f1d7e47c3aa27e924eadf44 (diff) | |
| download | vcpkg-86a652c31cba8a70eef41f999e2a6dc1be592303.tar.gz vcpkg-86a652c31cba8a70eef41f999e2a6dc1be592303.zip | |
[libsodium] Upgrade to 1.0.16
| -rw-r--r-- | ports/libsodium/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libsodium/portfile.cmake | 58 |
2 files changed, 29 insertions, 31 deletions
diff --git a/ports/libsodium/CONTROL b/ports/libsodium/CONTROL index 4048a6a1f..7546bdd14 100644 --- a/ports/libsodium/CONTROL +++ b/ports/libsodium/CONTROL @@ -1,3 +1,3 @@ Source: libsodium -Version: 1.0.15-1 +Version: 1.0.16 Description: A modern and easy-to-use crypto library diff --git a/ports/libsodium/portfile.cmake b/ports/libsodium/portfile.cmake index 4a2ed3d77..d6da66ab4 100644 --- a/ports/libsodium/portfile.cmake +++ b/ports/libsodium/portfile.cmake @@ -1,12 +1,10 @@ include(vcpkg_common_functions) -set(LIBSODIUM_VERSION 1.0.15) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO jedisct1/libsodium - REF ${LIBSODIUM_VERSION} - SHA512 ec497cb0007597efaeae0aecaa7484d6dcc53367607ec3fd28a98c6209f0cdecd5a6f560c15badd3a69b8da7d63676b11fb395ef4ed4da9b80467dbdc5f65a72 + REF 1.0.16 + SHA512 a9b5c4484f08f3ec1703a6c3af0acfa233214d0d38f32c1fc26305fc01cd2d9c8d469d52d98e6329729c08c15ee0494494037d5ad1472864d3cbdb55a751afec HEAD_REF master ) @@ -17,56 +15,56 @@ vcpkg_apply_patches( ) if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - set(LIBSODIUM_RELEASE_CONFIGURATION ReleaseDLL) - set(LIBSODIUM_DEBUG_CONFIGURATION DebugDLL) + set(LIBSODIUM_RELEASE_CONFIGURATION ReleaseDLL) + set(LIBSODIUM_DEBUG_CONFIGURATION DebugDLL) else() - set(LIBSODIUM_RELEASE_CONFIGURATION Release) - set(LIBSODIUM_DEBUG_CONFIGURATION Debug) + set(LIBSODIUM_RELEASE_CONFIGURATION Release) + set(LIBSODIUM_DEBUG_CONFIGURATION Debug) endif() vcpkg_build_msbuild( - PROJECT_PATH ${SOURCE_PATH}/libsodium.vcxproj - RELEASE_CONFIGURATION ${LIBSODIUM_RELEASE_CONFIGURATION} - DEBUG_CONFIGURATION ${LIBSODIUM_DEBUG_CONFIGURATION} + PROJECT_PATH ${SOURCE_PATH}/libsodium.vcxproj + RELEASE_CONFIGURATION ${LIBSODIUM_RELEASE_CONFIGURATION} + DEBUG_CONFIGURATION ${LIBSODIUM_DEBUG_CONFIGURATION} ) IF(VCPKG_TARGET_ARCHITECTURE MATCHES "x86") - SET(BUILD_ARCH "Win32") + SET(BUILD_ARCH "Win32") ELSE() - SET(BUILD_ARCH ${VCPKG_TARGET_ARCHITECTURE}) + SET(BUILD_ARCH ${VCPKG_TARGET_ARCHITECTURE}) ENDIF() file(GLOB LIBSODIUM_HEADERS "${SOURCE_PATH}/src/libsodium/include/sodium/*.h") file(INSTALL - ${LIBSODIUM_HEADERS} - DESTINATION ${CURRENT_PACKAGES_DIR}/include/sodium + ${LIBSODIUM_HEADERS} + DESTINATION ${CURRENT_PACKAGES_DIR}/include/sodium ) 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 - ) + 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 + ${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.lib - DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib + ${SOURCE_PATH}/Build/${LIBSODIUM_DEBUG_CONFIGURATION}/${BUILD_ARCH}/libsodium.lib + DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib ) vcpkg_copy_pdbs() file(INSTALL - ${SOURCE_PATH}/LICENSE - DESTINATION ${CURRENT_PACKAGES_DIR}/share/libsodium - RENAME copyright + ${SOURCE_PATH}/LICENSE + DESTINATION ${CURRENT_PACKAGES_DIR}/share/libsodium + RENAME copyright ) |