diff options
| author | Brennan <brecon@microsoft.com> | 2021-03-26 11:10:47 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-26 11:10:47 -0700 |
| commit | be656b22a454b5ef3bb56113f5bf4c53b75fdba3 (patch) | |
| tree | 3e44c004c3797a17820f57b489e270564c5c154e | |
| parent | 5a10163c44526b5d42a67480ce7a692a36948761 (diff) | |
| download | vcpkg-be656b22a454b5ef3bb56113f5bf4c53b75fdba3.tar.gz vcpkg-be656b22a454b5ef3bb56113f5bf4c53b75fdba3.zip | |
[microsoft-signalr] Update port with new version and find_package support (#16885)
* Update microsoft-signalr port with new version and find_package support
* version
| -rw-r--r-- | ports/microsoft-signalr/CONTROL | 4 | ||||
| -rw-r--r-- | ports/microsoft-signalr/portfile.cmake | 9 | ||||
| -rw-r--r-- | ports/microsoft-signalr/remove-fno-rtti-compile-option.patch | 17 | ||||
| -rw-r--r-- | versions/baseline.json | 4 | ||||
| -rw-r--r-- | versions/m-/microsoft-signalr.json | 5 |
5 files changed, 14 insertions, 25 deletions
diff --git a/ports/microsoft-signalr/CONTROL b/ports/microsoft-signalr/CONTROL index 6b0f314a3..794ff2af2 100644 --- a/ports/microsoft-signalr/CONTROL +++ b/ports/microsoft-signalr/CONTROL @@ -1,6 +1,6 @@ Source: microsoft-signalr
-Version: 0.1.0-alpha1
-Port-Version: 2
+Version: 0.1.0-alpha2
+Port-Version: 0
Description: C++ Client for ASP.NET Core SignalR.
Default-Features: default-features
Homepage: https://github.com/aspnet/SignalR-Client-Cpp
diff --git a/ports/microsoft-signalr/portfile.cmake b/ports/microsoft-signalr/portfile.cmake index ff5b6074c..d4b2dac1a 100644 --- a/ports/microsoft-signalr/portfile.cmake +++ b/ports/microsoft-signalr/portfile.cmake @@ -1,10 +1,9 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO aspnet/SignalR-Client-Cpp
- REF v0.1.0-alpha1
- SHA512 d37eea194b0352a08dd89ac7622bdd6224312ad48a31d8ab36627a8aaff5e795e3513ad010eed516703f6da842a95119c1a4a290b145a43e91ff80a37fff8676
- HEAD_REF master
- PATCHES remove-fno-rtti-compile-option.patch
+ REF v0.1.0-alpha2
+ SHA512 5a25bdf1f4587c7c008b743c0e97c5b293839b4a63bad89b3c37a1affccfa26df12b20f69a822e8d0eddb4491b3f0e513f017c39528a39990527aac44b3d6f5b
+ HEAD_REF main
)
vcpkg_check_features(
@@ -27,7 +26,9 @@ vcpkg_configure_cmake( )
vcpkg_install_cmake()
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/share/microsoft-signalr)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/share ${CURRENT_PACKAGES_DIR}/lib/share)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/microsoft-signalr/remove-fno-rtti-compile-option.patch b/ports/microsoft-signalr/remove-fno-rtti-compile-option.patch deleted file mode 100644 index 4c2aac20c..000000000 --- a/ports/microsoft-signalr/remove-fno-rtti-compile-option.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/src/signalrclient/CMakeLists.txt b/src/signalrclient/CMakeLists.txt -index 42d64d3..10fa72f 100644 ---- a/src/signalrclient/CMakeLists.txt -+++ b/src/signalrclient/CMakeLists.txt -@@ -58,10 +58,10 @@ else() - target_compile_options(signalrclient PRIVATE -Wall) - endif() - -- # GCC on OSX has a bug with exceptions and no-rtti that can cause crashes -- if(NOT APPLE) -+ # boost-asio (a dependency) doesn't support fno-rtti anymore -+ if(0) - target_compile_options(signalrclient PRIVATE -fno-rtti) - endif() - target_compile_options(signalrclient PRIVATE -Wextra -Wpedantic -Wno-unknown-pragmas) - endif() - diff --git a/versions/baseline.json b/versions/baseline.json index fee501f25..dc4115289 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3833,8 +3833,8 @@ "port-version": 0 }, "microsoft-signalr": { - "baseline": "0.1.0-alpha1", - "port-version": 2 + "baseline": "0.1.0-alpha2", + "port-version": 0 }, "mikktspace": { "baseline": "2020-10-06", diff --git a/versions/m-/microsoft-signalr.json b/versions/m-/microsoft-signalr.json index 69a6f83d1..66a7d8afc 100644 --- a/versions/m-/microsoft-signalr.json +++ b/versions/m-/microsoft-signalr.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "6035b3729564e1a85d60cc322d5dda0ea16d858d", + "version-string": "0.1.0-alpha2", + "port-version": 0 + }, + { "git-tree": "f713853a4b9a4cab2c7c26abd868b1b04fc47bec", "version-string": "0.1.0-alpha1", "port-version": 2 |
