mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-28 01:48:59 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[azure-storage-cpp][cpp-redis][dirent][doctest][gdcm2][grpc][llvm][matio][spdlog][yaml-cpp] Upgrades

Browse Source
This commit is contained in:
Robert Schumacher 2018-02-22 07:54:18 -08:00
parent 896b3d9e5c
commit e3dda1a82d
21 changed files with 42 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/azure-storage-cpp/CONTROL
View File

@ -1,5 +1,5 @@
Source: azure-storage-cpp
Version: 3.0.0-4
Version: 3.1.0
Build-Depends: cpprestsdk, atlmfc
Description: Microsoft Azure Storage Client SDK for C++
A client library for working with Microsoft Azure storage services including blobs, files, tables, and queues. This client library enables working with the Microsoft Azure storage services which include the blob service for storing binary and text data, the file service for storing binary and text data, the table service for storing structured non-relational data, and the queue service for storing messages that may be accessed by a client. Microsoft Azure Storage team's blog - http://blogs.msdn.com/b/windowsazurestorage/

4
ports/azure-storage-cpp/portfile.cmake
View File

@ -7,8 +7,8 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Azure/azure-storage-cpp
REF v3.0.0
SHA512 45d0d7f8cc350a16cff0371cdd442e851912c89061acfec559482e8f79cebafffd8681b32a30b878e329235cd3aaad5d2ff797d1148302e3109cf5111df14b97
REF v3.1.0
SHA512 ebd6f8aab33046942d641bd42b126dae94c49c08963b96b0141cd6827cb865c95f05f4c7a4df9ce8c62b4ec39092c0538a8c274a0a7219c74656ad111b15bfb8
HEAD_REF master
)

2
ports/cpp-redis/CONTROL
View File

@ -1,4 +1,4 @@
Source: cpp-redis
Version: 4.3.0
Version: 4.3.1
Build-Depends: tacopie
Description: cpp-redis is a C++11 Asynchronous Multi-Platform Lightweight Redis Client, with support for synchronous operations and pipelining.

29
ports/cpp-redis/fix-cmakelists.patch
View File

@ -1,29 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ae20868..01bb84c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -26,6 +26,7 @@
cmake_minimum_required(VERSION 2.8.7)
set(CMAKE_MACOSX_RPATH 1)
include(${CMAKE_ROOT}/Modules/ExternalProject.cmake)
+include(${CMAKE_ROOT}/Modules/GenerateExportHeader.cmake)
###
@@ -170,6 +171,8 @@ if(USE_CUSTOM_TCP_CLIENT)
set_target_properties(${PROJECT} PROPERTIES COMPILE_DEFINITIONS "__CPP_REDIS_USE_CUSTOM_TCP_CLIENT=${USE_CUSTOM_TCP_CLIENT}")
endif(USE_CUSTOM_TCP_CLIENT)
+generate_export_header(${PROJECT} EXPORT_FILE_NAME ${CMAKE_BINARY_DIR}/cpp_redis/misc/${PROJECT}_export.hpp)
+target_include_directories(${PROJECT} PUBLIC ${CMAKE_BINARY_DIR})
###
# install
@@ -181,6 +184,7 @@ install(DIRECTORY DESTINATION ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
install(DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} DESTINATION lib USE_SOURCE_PERMISSIONS)
install(DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} DESTINATION bin USE_SOURCE_PERMISSIONS)
install(DIRECTORY ${CPP_REDIS_INCLUDES}/ DESTINATION include USE_SOURCE_PERMISSIONS)
+install (FILES ${CMAKE_BINARY_DIR}/cpp_redis/misc/${PROJECT}_export.hpp DESTINATION include/cpp_redis/misc)
###

22
ports/cpp-redis/fix-export.patch
View File

@ -1,22 +0,0 @@
diff --git a/includes/cpp_redis/misc/logger.hpp b/includes/cpp_redis/misc/logger.hpp
index d79a98f..bfb33b9 100644
--- a/includes/cpp_redis/misc/logger.hpp
+++ b/includes/cpp_redis/misc/logger.hpp
@@ -26,6 +26,8 @@
#include <mutex>
#include <string>
+#include <cpp_redis/misc/cpp_redis_export.hpp>
+
namespace cpp_redis {
//!
@@ -161,7 +163,7 @@ private:
//! variable containing the current logger
//! by default, not set (no logs)
//!
-extern std::unique_ptr<logger_iface> active_logger;
+extern CPP_REDIS_EXPORT std::unique_ptr<logger_iface> active_logger;
//!
//! debug logging

28
ports/cpp-redis/portfile.cmake
View File

@ -3,21 +3,14 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Cylix/cpp_redis
REF 4.3.0
SHA512 d4a2865b72b4dfa80b6d3c004245014a77e74d4a3d254d6b0a9d50e890a22dc3d9ce54688a8c9185ecee9bbf8cdf76046a9788c70887ccf8a08d5cdcef298b46
REF 4.3.1
SHA512 abf372542c53f37f504b3211b840b100d07a8f4b2e7f5584cc7550ab16ed617838e2df79064374c7a409458d8567f4834686318ea3a40249c767e36c744c7a47
HEAD_REF master
)
vcpkg_apply_patches(
SOURCE_PATH ${SOURCE_PATH}
PATCHES
${CMAKE_CURRENT_LIST_DIR}/fix-cmakelists.patch
${CMAKE_CURRENT_LIST_DIR}/fix-export.patch
)
file(COPY ${CMAKE_CURRENT_LIST_DIR}/tacopie/CMakeLists.txt DESTINATION ${SOURCE_PATH}/tacopie)
if(VCPKG_CRT_LINKAGE STREQUAL dynamic)
if(VCPKG_CRT_LINKAGE STREQUAL "dynamic")
set(MSVC_RUNTIME_LIBRARY_CONFIG "/MD")
else()
set(MSVC_RUNTIME_LIBRARY_CONFIG "/MT")
@ -43,16 +36,23 @@ file(GLOB_RECURSE FILES "${CURRENT_PACKAGES_DIR}/include/*")
foreach(file ${FILES})
file(READ ${file} _contents)
string(REPLACE "ifndef __CPP_REDIS_USE_CUSTOM_TCP_CLIENT" "if 1" _contents "${_contents}")
if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
string(REPLACE
"extern std::unique_ptr<logger_iface> active_logger;"
"extern __declspec(dllimport) std::unique_ptr<logger_iface> active_logger;"
_contents "${_contents}")
endif()
file(WRITE ${file} "${_contents}")
endforeach()
file(COPY ${CURRENT_PACKAGES_DIR}/debug/lib/lib ${CURRENT_PACKAGES_DIR}/debug/bin/bin DESTINATION ${CURRENT_PACKAGES_DIR}/debug)
file(COPY ${CURRENT_PACKAGES_DIR}/lib/lib ${CURRENT_PACKAGES_DIR}/bin/bin DESTINATION ${CURRENT_PACKAGES_DIR})
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/lib ${CURRENT_PACKAGES_DIR}/debug/bin/bin ${CURRENT_PACKAGES_DIR}/lib/lib ${CURRENT_PACKAGES_DIR}/bin/bin)
file(GLOB FILES_TO_REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/cpp_redis.ilk" "${CURRENT_PACKAGES_DIR}/bin/cpp_redis.dll.manifest")
if(FILES_TO_REMOVE)
file(REMOVE_RECURSE ${FILES_TO_REMOVE})
endif()
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/cpp-redis RENAME copyright)
if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
endif()

2
ports/dirent/CONTROL
View File

@ -1,3 +1,3 @@
Source: dirent
Version: 2017-06-23-5c7194c2fe2c68c1a8212712c0b4b6195382d27d
Version: 1.23.1
Description: Dirent is a C/C++ programming interface that allows programmers to retrieve information about files and directories under Linux/UNIX. This project provides Linux compatible Dirent interface for Microsoft Windows.

4
ports/dirent/portfile.cmake
View File

@ -2,8 +2,8 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO tronkko/dirent
REF 8b1db5092479a73d47eafd3de739b27e876e6bf3
SHA512 f529aa65c2a4b8249c1291f3bccad25fa3a9c2146a2c74abc0a4710f68e2bd6f73cd52682bb406fbcab71d6a5225a354f9e8bdc22ce63b7a4e64bb65bab34b9f
REF 1.23.1
SHA512 13c59f0d225ccc09a2b92a29b41b6644dabdb0b39df7bb528d5ac60dbe71a2770eaa37d3890e0df21065bc798e9cc018e174d34c6697da7da665caafe062bbc2
HEAD_REF master
)
file(INSTALL ${SOURCE_PATH}/include/ DESTINATION ${CURRENT_PACKAGES_DIR}/include)

2
ports/doctest/CONTROL
View File

@ -1,3 +1,3 @@
Source: doctest
Version: 1.2.6
Version: 1.2.7
Description: The fastest feature-rich C++ single-header testing framework for unit tests and TDD

4
ports/doctest/portfile.cmake
View File

@ -3,8 +3,8 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO onqtam/doctest
REF 1.2.6
SHA512 bee59e9e18a474b9a7883e0c506a1133fdd382d3ecbe010c0402399d6c48572508bfa347a2196908d846e345508c564f758b17c268a19b65968f5c2ff87b25a4
REF 1.2.7
SHA512 aa6671eb0ac0a7336ad81dea4d696ce61849ab7eb97d6f0f549446b2ac7538a8cdb0a87b8500b3af41cd3f10672ae13591633b368cbcb901f361f7715f22e4e9
HEAD_REF master
)

2
ports/gdcm2/CONTROL
View File

@ -1,4 +1,4 @@
Source: gdcm2
Version: 2.8.3
Version: 2.8.4
Description: Grassroots DICOM library
Build-Depends: zlib, expat

4
ports/gdcm2/portfile.cmake
View File

@ -14,8 +14,8 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO malaterre/GDCM
REF v2.8.3
SHA512 f8c3d600f067c9b60a32ff5fb7e751c06088e1e4a8e8d0f5e25d9fc7d49e8fab1f0242b10433f522d2043777cddace78c5a9c2cb25bac75a8e84fee554370f62
REF v2.8.4
SHA512 d58854507bcc477bcf7944c82014ceac4c603bf8f0e75ddda2371052f4972f1535cb782b47d0822a8929131b804ea5c16b9236b414d70cbf96a494741391c534
)
vcpkg_apply_patches(

2
ports/grpc/CONTROL
View File

@ -1,4 +1,4 @@
Source: grpc
Version: 1.8.3
Version: 1.9.1
Build-Depends: zlib, openssl, protobuf, c-ares
Description: An RPC library and framework

4
ports/grpc/portfile.cmake
View File

@ -12,8 +12,8 @@ endif()
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO grpc/grpc
REF v1.8.3
SHA512 9bf308252221488840fad7669b8f10143c6e2130585b350b31b8d9f362f55cb1d16e5ee79d9d02ce13521e9471a8d55e8fd6c1ae0b710e22e3f918fb9fdc4d40
REF v1.9.1
SHA512 2043b76f76680df9759d1eef9d524af2b5f82237cd08428a7aa87cadae516052b37dee470a0850e6d63f685e95f0593900d640f7e4f2fa9de9e8c2b760a82191
HEAD_REF master
)

2
ports/llvm/portfile.cmake
View File

@ -1,3 +1,5 @@
message(FATAL_ERROR "temporarily disabled")
# LLVM documentation recommends always using static library linkage when
# building with Microsoft toolchain; it's also the default on other platforms
set(VCPKG_LIBRARY_LINKAGE static)

2
ports/matio/CONTROL
View File

@ -1,4 +1,4 @@
Source: matio
Version: 1.5.10-2
Version: 1.5.11
Description: MATLAB MAT File I/O Library
Build-Depends: zlib, hdf5

4
ports/matio/portfile.cmake
View File

@ -2,8 +2,8 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO tbeu/matio
REF v1.5.10
SHA512 c06ff6b3d17a136be20cebca4e1a4bb87eea98e35d979713e73f855487dee568895245528b1b8e55caf02f88aff1b742daf75f590e2d3b08158d0ad73e377243
REF v1.5.11
SHA512 f500475e80cdb52a4754c49e900a34c0b540a5c64f353287e6b85b0c16156b251fe8088f2ed584af5a4d0916e98fddf73a3799e7c045ab859298687038e6d513
HEAD_REF master
)

2
ports/spdlog/CONTROL
View File

@ -1,4 +1,4 @@
Source: spdlog
Version: 0.14.0-1
Version: 0.16.3
Description: Very fast, header only, C++ logging library
Build-Depends: fmt

4
ports/spdlog/portfile.cmake
View File

@ -3,8 +3,8 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO gabime/spdlog
REF v0.14.0
SHA512 f49b7f26f4fde57fe16f32ab89082f0c590645c627f5b4646f633a16f3eec2926b3465e742bc4899cb802e7b974978c547638205065e9955ed9696fbcaf0b444
REF v0.16.3
SHA512 6e08473825cf97dfb10b0e919b77996c1023bbfb583d851e961ec4a95094e4afffd1fc6f6e7e728ce8c2c69c9fb280c59f8d6494b50224bdf8cc68914ffd21e8
HEAD_REF master
)

2
ports/yaml-cpp/CONTROL
View File

@ -1,3 +1,3 @@
Source: yaml-cpp
Version: 0.5.4-rc-2
Version: 0.6.1
Description: yaml-cpp is a YAML parser and emitter in C++ matching the YAML 1.2 spec.

5
ports/yaml-cpp/portfile.cmake
View File

@ -2,8 +2,8 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO jbeder/yaml-cpp
REF 380ecb404ef99ba132154ed43dd2b84136b30b14
SHA512 30d344d271d15163be755c998b28750857355f26a3fdbaf620932b60e419a7f72884bc7fd65bf3076f4e5315e0f82aab6011406a8146e2c01ba3fc267723d5bc
REF yaml-cpp-0.6.1
SHA512 606482d1d38c6747e22604a24c119adb4b70287da7deadb94cc20d70df47122f1714ec9bfc8f566ecf075b94d48771df17430c50039cb984bdf1980f3b445791
HEAD_REF master
)
@ -12,6 +12,7 @@ vcpkg_configure_cmake(
PREFER_NINJA
OPTIONS
-DYAML_CPP_BUILD_TOOLS=OFF
-DYAML_CPP_BUILD_TESTS=OFF
)
vcpkg_install_cmake()