diff options
| author | Cheney Wang <38240633+Cheney-W@users.noreply.github.com> | 2018-12-17 16:44:08 -0800 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-12-17 16:44:08 -0800 |
| commit | c094d3133c0b7776c74e1463d64cc079c9960068 (patch) | |
| tree | 958acf5914899c80b59e78892d80b91ecd01ff34 /ports/caf | |
| parent | 8ba6cbec0dfc6c8d692136d27c74f98387233641 (diff) | |
| download | vcpkg-c094d3133c0b7776c74e1463d64cc079c9960068.tar.gz vcpkg-c094d3133c0b7776c74e1463d64cc079c9960068.zip | |
Update release version or commit to latest for below ports (#4957)
* [botan][caf][celero][docopt][glbinding][nanodbc][sfgui]Update release version or commit to latest
* [sfml] Add find_dependency(Freetype)
Diffstat (limited to 'ports/caf')
| -rw-r--r-- | ports/caf/CONTROL | 2 | ||||
| -rw-r--r-- | ports/caf/openssl-version-override.patch | 12 | ||||
| -rw-r--r-- | ports/caf/portfile.cmake | 11 |
3 files changed, 11 insertions, 14 deletions
diff --git a/ports/caf/CONTROL b/ports/caf/CONTROL index e9b8cd0bf..6f39010be 100644 --- a/ports/caf/CONTROL +++ b/ports/caf/CONTROL @@ -1,4 +1,4 @@ Source: caf -Version: 0.15.7 +Version: 0.16.2 Build-Depends: openssl Description: an open source C++11 actor model implementation featuring lightweight & fast actor implementations, pattern matching for messages, network transparent messaging, and more. diff --git a/ports/caf/openssl-version-override.patch b/ports/caf/openssl-version-override.patch index bccbd6ca4..5a0337134 100644 --- a/ports/caf/openssl-version-override.patch +++ b/ports/caf/openssl-version-override.patch @@ -1,14 +1,14 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a7b75f7..794af1d 100644
+index 2d908e8..d270297 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -545,6 +545,9 @@ if(NOT CAF_NO_OPENSSL)
+@@ -495,6 +495,9 @@ if(NOT CAF_NO_OPENSSL)
message(STATUS
"Disable OpenSSL. Required >= 1.0.1 due to TLSv1.2 support.")
set(CAF_NO_OPENSSL yes)
+ elseif(CAF_OPENSSL_VERSION_OVERRIDE)
-+ include_directories(BEFORE ${OPENSSL_INCLUDE_DIR})
-+ add_optional_caf_lib(openssl)
++ include_directories(BEFORE ${OPENSSL_INCLUDE_DIR})
++ add_optional_caf_lib(openssl)
else()
- # Check if openssl headers and library versions match
- set(CMAKE_REQUIRED_LIBRARIES ${OPENSSL_LIBRARIES})
+ if(NOT CMAKE_CROSSCOMPILING)
+ # Check if openssl headers and library versions match
diff --git a/ports/caf/portfile.cmake b/ports/caf/portfile.cmake index aecd84116..ae5e24c1b 100644 --- a/ports/caf/portfile.cmake +++ b/ports/caf/portfile.cmake @@ -8,14 +8,11 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO actor-framework/actor-framework - REF 0.15.7 - SHA512 ff0fa205ad71677b84fa09a2e6ce6bb6d1bc9b790bbbc3ac51505467402ff61a218528004212efa2063c798cc512972d318a2c9423067ee51cef719de2b6b186 + REF 2cc4377715afc3d3c35848f9d59b9e6876afd875 + SHA512 7e7962bf5a30122bde8be63f6de0058f865bd890e2d10f4d90f4885b7953467fb6532f69c1a77a35802de7c531f6aac192a2993b53a8dc0b05f503c3f4083a31 HEAD_REF master -) - -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} - PATCHES ${CMAKE_CURRENT_LIST_DIR}/openssl-version-override.patch + PATCHES + openssl-version-override.patch ) vcpkg_configure_cmake( |