aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>2021-03-16 06:57:19 +0800
committerGitHub <noreply@github.com>2021-03-15 15:57:19 -0700
commitbe12a4dd1c052904b0b1c38751a6c0a4b2cf618d (patch)
tree2d0da25e503f2f8e62af04262985ac6b4bf4fb24
parentca35082c483ef08aa1be80aad715004232a3abc5 (diff)
downloadvcpkg-be12a4dd1c052904b0b1c38751a6c0a4b2cf618d.tar.gz
vcpkg-be12a4dd1c052904b0b1c38751a6c0a4b2cf618d.zip
[ixwebsocket] Fix cmake-configure files install path (#16710)
* [ixwebsocket] Fix cmake-configure files install path * Update versions
-rw-r--r--ports/ixwebsocket/CONTROL22
-rw-r--r--ports/ixwebsocket/portfile.cmake2
-rw-r--r--ports/ixwebsocket/vcpkg.json63
-rw-r--r--versions/baseline.json2
-rw-r--r--versions/i-/ixwebsocket.json5
5 files changed, 70 insertions, 24 deletions
diff --git a/ports/ixwebsocket/CONTROL b/ports/ixwebsocket/CONTROL
deleted file mode 100644
index f2fbd3dba..000000000
--- a/ports/ixwebsocket/CONTROL
+++ /dev/null
@@ -1,22 +0,0 @@
-Source: ixwebsocket
-Version: 11.0.4
-Build-Depends: zlib
-Homepage: https://github.com/machinezone/IXWebSocket
-Description: Lightweight WebSocket Client and Server + HTTP Client and Server
-Default-Features: ssl
-
-Feature: ssl
-Build-Depends: ixwebsocket[openssl] (!uwp&!windows&!osx), ixwebsocket[mbedtls] (windows), ixwebsocket[mbedtls] (uwp), ixwebsocket[sectransp] (osx)
-Description: Default SSL backend
-
-# SSL backends
-Feature: openssl
-Build-Depends: openssl
-Description: SSL support (OpenSSL)
-
-Feature: mbedtls
-Build-Depends: mbedtls
-Description: SSL support (mbedTLS)
-
-Feature: sectransp
-Description: SSL support (sectransp)
diff --git a/ports/ixwebsocket/portfile.cmake b/ports/ixwebsocket/portfile.cmake
index 71a8faf9b..e5979ca4e 100644
--- a/ports/ixwebsocket/portfile.cmake
+++ b/ports/ixwebsocket/portfile.cmake
@@ -27,7 +27,7 @@ vcpkg_configure_cmake(
)
vcpkg_install_cmake()
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/ixwebsocket TARGET_PATH share/${port})
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/ixwebsocket)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
diff --git a/ports/ixwebsocket/vcpkg.json b/ports/ixwebsocket/vcpkg.json
new file mode 100644
index 000000000..d905df1dc
--- /dev/null
+++ b/ports/ixwebsocket/vcpkg.json
@@ -0,0 +1,63 @@
+{
+ "name": "ixwebsocket",
+ "version-semver": "11.0.4",
+ "port-version": 1,
+ "description": "Lightweight WebSocket Client and Server + HTTP Client and Server",
+ "homepage": "https://github.com/machinezone/IXWebSocket",
+ "dependencies": [
+ "zlib"
+ ],
+ "default-features": [
+ "ssl"
+ ],
+ "features": {
+ "mbedtls": {
+ "description": "SSL support (mbedTLS)",
+ "dependencies": [
+ "mbedtls"
+ ]
+ },
+ "openssl": {
+ "description": "SSL support (OpenSSL)",
+ "dependencies": [
+ "openssl"
+ ]
+ },
+ "sectransp": {
+ "description": "SSL support (sectransp)"
+ },
+ "ssl": {
+ "description": "Default SSL backend",
+ "dependencies": [
+ {
+ "name": "ixwebsocket",
+ "features": [
+ "sectransp"
+ ],
+ "platform": "osx"
+ },
+ {
+ "name": "ixwebsocket",
+ "features": [
+ "mbedtls"
+ ],
+ "platform": "windows"
+ },
+ {
+ "name": "ixwebsocket",
+ "features": [
+ "mbedtls"
+ ],
+ "platform": "windows & uwp"
+ },
+ {
+ "name": "ixwebsocket",
+ "features": [
+ "openssl"
+ ],
+ "platform": "!uwp & !windows & !osx"
+ }
+ ]
+ }
+ }
+}
diff --git a/versions/baseline.json b/versions/baseline.json
index c342e35b5..bda4d83f9 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2618,7 +2618,7 @@
},
"ixwebsocket": {
"baseline": "11.0.4",
- "port-version": 0
+ "port-version": 1
},
"jack2": {
"baseline": "1.9.14",
diff --git a/versions/i-/ixwebsocket.json b/versions/i-/ixwebsocket.json
index 07965b87f..e70a72df9 100644
--- a/versions/i-/ixwebsocket.json
+++ b/versions/i-/ixwebsocket.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "33b7e643eb40d7924d1210e1ce7d1a597281deb8",
+ "version-semver": "11.0.4",
+ "port-version": 1
+ },
+ {
"git-tree": "582194408bcd77d15880e2f7e7c1658c0c91310d",
"version-string": "11.0.4",
"port-version": 0