[libsodium] Upgrade to 1.0.16

This commit is contained in:
Robert Schumacher 2018-02-22 06:22:12 -08:00
parent ef9d50ecb3
commit 86a652c31c
2 changed files with 29 additions and 31 deletions

View File

@ -1,3 +1,3 @@
Source: libsodium Source: libsodium
Version: 1.0.15-1 Version: 1.0.16
Description: A modern and easy-to-use crypto library Description: A modern and easy-to-use crypto library

View File

@ -1,12 +1,10 @@
include(vcpkg_common_functions) include(vcpkg_common_functions)
set(LIBSODIUM_VERSION 1.0.15)
vcpkg_from_github( vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
REPO jedisct1/libsodium REPO jedisct1/libsodium
REF ${LIBSODIUM_VERSION} REF 1.0.16
SHA512 ec497cb0007597efaeae0aecaa7484d6dcc53367607ec3fd28a98c6209f0cdecd5a6f560c15badd3a69b8da7d63676b11fb395ef4ed4da9b80467dbdc5f65a72 SHA512 a9b5c4484f08f3ec1703a6c3af0acfa233214d0d38f32c1fc26305fc01cd2d9c8d469d52d98e6329729c08c15ee0494494037d5ad1472864d3cbdb55a751afec
HEAD_REF master HEAD_REF master
) )
@ -17,56 +15,56 @@ vcpkg_apply_patches(
) )
if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
set(LIBSODIUM_RELEASE_CONFIGURATION ReleaseDLL) set(LIBSODIUM_RELEASE_CONFIGURATION ReleaseDLL)
set(LIBSODIUM_DEBUG_CONFIGURATION DebugDLL) set(LIBSODIUM_DEBUG_CONFIGURATION DebugDLL)
else() else()
set(LIBSODIUM_RELEASE_CONFIGURATION Release) set(LIBSODIUM_RELEASE_CONFIGURATION Release)
set(LIBSODIUM_DEBUG_CONFIGURATION Debug) set(LIBSODIUM_DEBUG_CONFIGURATION Debug)
endif() endif()
vcpkg_build_msbuild( vcpkg_build_msbuild(
PROJECT_PATH ${SOURCE_PATH}/libsodium.vcxproj PROJECT_PATH ${SOURCE_PATH}/libsodium.vcxproj
RELEASE_CONFIGURATION ${LIBSODIUM_RELEASE_CONFIGURATION} RELEASE_CONFIGURATION ${LIBSODIUM_RELEASE_CONFIGURATION}
DEBUG_CONFIGURATION ${LIBSODIUM_DEBUG_CONFIGURATION} DEBUG_CONFIGURATION ${LIBSODIUM_DEBUG_CONFIGURATION}
) )
IF(VCPKG_TARGET_ARCHITECTURE MATCHES "x86") IF(VCPKG_TARGET_ARCHITECTURE MATCHES "x86")
SET(BUILD_ARCH "Win32") SET(BUILD_ARCH "Win32")
ELSE() ELSE()
SET(BUILD_ARCH ${VCPKG_TARGET_ARCHITECTURE}) SET(BUILD_ARCH ${VCPKG_TARGET_ARCHITECTURE})
ENDIF() ENDIF()
file(GLOB LIBSODIUM_HEADERS "${SOURCE_PATH}/src/libsodium/include/sodium/*.h") file(GLOB LIBSODIUM_HEADERS "${SOURCE_PATH}/src/libsodium/include/sodium/*.h")
file(INSTALL file(INSTALL
${LIBSODIUM_HEADERS} ${LIBSODIUM_HEADERS}
DESTINATION ${CURRENT_PACKAGES_DIR}/include/sodium DESTINATION ${CURRENT_PACKAGES_DIR}/include/sodium
) )
if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
file(INSTALL file(INSTALL
${SOURCE_PATH}/Build/${LIBSODIUM_RELEASE_CONFIGURATION}/${BUILD_ARCH}/libsodium.dll ${SOURCE_PATH}/Build/${LIBSODIUM_RELEASE_CONFIGURATION}/${BUILD_ARCH}/libsodium.dll
DESTINATION ${CURRENT_PACKAGES_DIR}/bin DESTINATION ${CURRENT_PACKAGES_DIR}/bin
) )
file(INSTALL file(INSTALL
${SOURCE_PATH}/Build/${LIBSODIUM_DEBUG_CONFIGURATION}/${BUILD_ARCH}/libsodium.dll ${SOURCE_PATH}/Build/${LIBSODIUM_DEBUG_CONFIGURATION}/${BUILD_ARCH}/libsodium.dll
DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin
) )
endif() endif()
file(INSTALL file(INSTALL
${SOURCE_PATH}/Build/${LIBSODIUM_RELEASE_CONFIGURATION}/${BUILD_ARCH}/libsodium.lib ${SOURCE_PATH}/Build/${LIBSODIUM_RELEASE_CONFIGURATION}/${BUILD_ARCH}/libsodium.lib
DESTINATION ${CURRENT_PACKAGES_DIR}/lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib
) )
file(INSTALL file(INSTALL
${SOURCE_PATH}/Build/${LIBSODIUM_DEBUG_CONFIGURATION}/${BUILD_ARCH}/libsodium.lib ${SOURCE_PATH}/Build/${LIBSODIUM_DEBUG_CONFIGURATION}/${BUILD_ARCH}/libsodium.lib
DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib
) )
vcpkg_copy_pdbs() vcpkg_copy_pdbs()
file(INSTALL file(INSTALL
${SOURCE_PATH}/LICENSE ${SOURCE_PATH}/LICENSE
DESTINATION ${CURRENT_PACKAGES_DIR}/share/libsodium DESTINATION ${CURRENT_PACKAGES_DIR}/share/libsodium
RENAME copyright RENAME copyright
) )