Merge from master

2 files changed, 11 insertions, 12 deletions

diff --git a/ports/restbed/CONTROL b/ports/restbed/CONTROL
index 53f6ea0de..7259f92c6 100644
--- a/ports/restbed/CONTROL
+++ b/ports/restbed/CONTROL
@@ -1,8 +1,8 @@
 Source: restbed

-Version: 4.16-07-28-2018-1

+Version: 4.16-07-28-2018-2

 Description: Corvusoft's Restbed framework brings asynchronous RESTful functionality to C++11 applications.

 Build-Depends: asio

 

 Feature: openssl

 Build-Depends: openssl

-Description: Secure over the wire communication allowing you to transmit private data online.
\ No newline at end of file
+Description: Secure over the wire communication allowing you to transmit private data online.

diff --git a/ports/restbed/portfile.cmake b/ports/restbed/portfile.cmake
index 7b4a2d944..5c653bd4f 100644
--- a/ports/restbed/portfile.cmake
+++ b/ports/restbed/portfile.cmake
@@ -2,24 +2,23 @@ include(vcpkg_common_functions)
 

 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)

 

+set(USE_OPENSSL OFF)

+if("openssl" IN_LIST FEATURES)

+    set(ADDITIONAL_PATCH "add_openssl_support.patch")

+    set(USE_OPENSSL ON)

+endif()

+

 vcpkg_from_github(

     OUT_SOURCE_PATH SOURCE_PATH

     REPO Corvusoft/restbed

     REF 0f8af8d8ed183a88e208adeb22da0080d5d74d1e

     SHA512 f0175a10c88f1ad4f16c8e4cff7ceea7b80c56b0724b59791c23e91f1ecf146dfdbda9e9238d31a35f21d8cdcc413b586cc633725dd0ba87de6b599a7087916f

     HEAD_REF master

-    PATCHES cmake.patch

+    PATCHES

+        cmake.patch

+        ${ADDITIONAL_PATCH}

 )

 

-set(USE_OPENSSL OFF)

-if("openssl" IN_LIST FEATURES)

-	vcpkg_apply_patches(

-	SOURCE_PATH ${SOURCE_PATH}

-    PATCHES add_openssl_support.patch

-	)

-    set(USE_OPENSSL ON)

-endif()

-

 vcpkg_configure_cmake(

     SOURCE_PATH ${SOURCE_PATH}

     PREFER_NINJA