diff options
| author | Benjamin Sergeant <bsergean@gmail.com> | 2020-05-19 14:36:36 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-19 14:36:36 -0700 |
| commit | 9e03a3ac59797fcee9e0670d5e002b3a2a78ac44 (patch) | |
| tree | 86244c7f7a3adb0e5c0803bdaa54b4959178ad92 | |
| parent | 3864f7b0c34b67e7ffd19e34eb4d465aca24066e (diff) | |
| download | vcpkg-9e03a3ac59797fcee9e0670d5e002b3a2a78ac44.tar.gz vcpkg-9e03a3ac59797fcee9e0670d5e002b3a2a78ac44.zip | |
[ixwebsocket] update to 9.6.2 (#11030)
* [ixwebsocket] update to 9.5.0
* remove reference to vcpkg_test_cmake which is deprecated (was commented)
* remove all features, bump to depend on 9.5.2
* wrong sha512
* exclude uwp from the supported platforms / cannot see in logfiles why it is not building + I do not have access to this platform for testing
* try again uwp
* bring back mbedtls dep
* 9.5.8 has an old pre 1.1 openssl fix
* use mbedtls on windows and uwp
* revert to original CONTROL file
* do not install ixwebsocketConfig.cmake which conflicts with vcpkg
* portfile will handles openssl, mbedtls and sectransp options to choose the tls backend library
Co-authored-by: Benjamin Sergeant <bsergeant@mz.com>
| -rw-r--r-- | ports/ixwebsocket/CONTROL | 2 | ||||
| -rw-r--r-- | ports/ixwebsocket/portfile.cmake | 24 |
2 files changed, 18 insertions, 8 deletions
diff --git a/ports/ixwebsocket/CONTROL b/ports/ixwebsocket/CONTROL index 4acae5c3f..dac666e36 100644 --- a/ports/ixwebsocket/CONTROL +++ b/ports/ixwebsocket/CONTROL @@ -1,5 +1,5 @@ Source: ixwebsocket -Version: 9.1.9 +Version: 9.6.2 Build-Depends: zlib Homepage: https://github.com/machinezone/IXWebSocket Description: Lightweight WebSocket Client and Server + HTTP Client and Server diff --git a/ports/ixwebsocket/portfile.cmake b/ports/ixwebsocket/portfile.cmake index 68e523a05..23aa61cef 100644 --- a/ports/ixwebsocket/portfile.cmake +++ b/ports/ixwebsocket/portfile.cmake @@ -1,14 +1,27 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO machinezone/IXWebSocket - REF v9.1.9 - SHA512 f1fd731b5f6a9ce6d6d10bee22a5d9d9baaa8ea0564d6c4cd7eb91dcb88a45c49b2c7fdb75f8640a3589c1b30cee33ef5df8dcbb55920d013394d1e33ddd3c8e + REF v9.6.2 + SHA512 22a97f0c74d5789fd265627bbadfce02116a41fca888d684b756cbb1c070d626517855e265c484870d02db7084b6c1107d500acc1c13e327ede0c23228a54f7b ) +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + openssl USE_OPEN_SSL + mbedtls USE_MBED_TLS + sectransp USE_SECURE_TRANSPORT +) + +if("sectransp" IN_LIST FEATURES AND NOT VCPKG_TARGET_IS_OSX) + message(FATAL_ERROR "sectransp is not supported on non-Apple platforms") +endif() + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA # Disable this option if project cannot be built with Ninja - OPTIONS -DUSE_TLS=1 + PREFER_NINJA + OPTIONS + ${FEATURE_OPTIONS} + -DUSE_TLS=1 ) vcpkg_install_cmake() @@ -17,6 +30,3 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) # Handle copyright file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) - -# Post-build test for cmake libraries -# vcpkg_test_cmake(PACKAGE_NAME ixwebsocket) |