diff options
| author | yurybura <yurybura@gmail.com> | 2020-06-23 23:05:20 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-23 13:05:20 -0700 |
| commit | 95fa5dbbc8f6eb4715a5881142bf49a4947a2797 (patch) | |
| tree | 664b8c49de317cd1df2062d937e253236c4269db | |
| parent | 7a28379b4c22e5467646bcffc2a9f89a076ab006 (diff) | |
| download | vcpkg-95fa5dbbc8f6eb4715a5881142bf49a4947a2797.tar.gz vcpkg-95fa5dbbc8f6eb4715a5881142bf49a4947a2797.zip | |
[open62541] update to v1.1, add encryption support (#12023)
| -rw-r--r-- | ports/open62541/CONTROL | 12 | ||||
| -rw-r--r-- | ports/open62541/fix-install-bindir.patch | 16 | ||||
| -rw-r--r-- | ports/open62541/portfile.cmake | 15 |
3 files changed, 20 insertions, 23 deletions
diff --git a/ports/open62541/CONTROL b/ports/open62541/CONTROL index 217a805b3..7fe4dfe46 100644 --- a/ports/open62541/CONTROL +++ b/ports/open62541/CONTROL @@ -1,4 +1,14 @@ Source: open62541 -Version: 1.0.1 +Version: 1.1 Homepage: https://open62541.org Description: open62541 is an open source C (C99) implementation of OPC UA licensed under the Mozilla Public License v2.0. +Supports: !uwp +Default-Features: openssl + +Feature: openssl +Description: Enable encryption support (uses OpenSSL) +Build-Depends: openssl + +Feature: mbedtls +Description: Enable encryption support (uses MbedTLS) +Build-Depends: mbedtls diff --git a/ports/open62541/fix-install-bindir.patch b/ports/open62541/fix-install-bindir.patch deleted file mode 100644 index 40eb3579d..000000000 --- a/ports/open62541/fix-install-bindir.patch +++ /dev/null @@ -1,16 +0,0 @@ - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index d426e1da..09589b6e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1151,7 +1151,7 @@ install(TARGETS open62541 - EXPORT open62541Targets - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} -- RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX} -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - INCLUDES DESTINATION include) - - if(UA_ENABLE_AMALGAMATION) diff --git a/ports/open62541/portfile.cmake b/ports/open62541/portfile.cmake index 55a649608..99f12e79c 100644 --- a/ports/open62541/portfile.cmake +++ b/ports/open62541/portfile.cmake @@ -1,14 +1,16 @@ -vcpkg_fail_port_install(ON_TARGET "UWP") - -set(VERSION v1.0.1) +set(VERSION v1.1) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO open62541/open62541 - REF e4309754fc2f6ea6508b59ca82e08c27b0118d74 # v1.0.1 - SHA512 bfff9e722c5ee70b93abc54fe0b3267c531bbe039d3344376069175b5d5d95324cd9471ad45674c50393fb0259faacfa94eac1814de11dde4538d76f3e74b2bb + REF a524accc338c9611a5ec60bf595c1a587243b457 # v1.1 + SHA512 ee60e6b58f31bb7d4a8875c4390cf54edee83d242b39b1730ee39af0e13c29d4aeb8788294c3da00039d60020a9a2e1e241e1fb389ffe36598116c58a7ffdaba HEAD_REF master - PATCHES fix-install-bindir.patch +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + openssl UA_ENABLE_ENCRYPTION_OPENSSL + mbedtls UA_ENABLE_ENCRYPTION_MBEDTLS ) vcpkg_find_acquire_program(PYTHON3) @@ -19,6 +21,7 @@ vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS + ${FEATURE_OPTIONS} -DOPEN62541_VERSION=${VERSION} OPTIONS_DEBUG -DCMAKE_DEBUG_POSTFIX=d |