Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[pistache] fix install #19206

Merged
merged 2 commits into from
Jul 28, 2021
Merged

[pistache] fix install #19206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6c7c8ad
[pistache] fix install
strega-nil Jul 28, 2021
32f45ca
fix ci.baseline.txt, versions
strega-nil Jul 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions ports/pistache/disable-warnings.patch
View file
Open in desktop

This file was deleted.

36 changes: 0 additions & 36 deletions ports/pistache/fix-debug-empty.patch
View file
Open in desktop

This file was deleted.

13 changes: 2 additions & 11 deletions ports/pistache/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,23 +8,14 @@ vcpkg_from_github(
REF 9dc080b9ebbe6fc1726b45e9db1550305938313e #2021-03-31
SHA512 b55c395fb98af85317590ed2502564af5e92e30a35618132568c6ab589a6d0971570ad20ddbd1f49d9dd8cf54692866c69cfc1350c6fdccf9efb039aacf153b4
HEAD_REF master
PATCHES
fix-debug-empty.patch
disable-warnings.patch
)

vcpkg_configure_cmake(
vcpkg_configure_meson(
SOURCE_PATH "${SOURCE_PATH}"
PREFER_NINJA
)
vcpkg_install_meson()

vcpkg_install_cmake()

vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/RapidJSON)
vcpkg_fixup_pkgconfig()

file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")

# Handle copyright
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
7 changes: 5 additions & 2 deletions ports/pistache/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
{
"name": "pistache",
"version-date": "2021-03-31",
"port-version": 1,
"port-version": 2,
"description": "Pistache is a modern and elegant HTTP and REST framework for C++. It is entirely written in pure-C++11 and provides a clear and pleasant API",
"homepage": "https://github.com/oktal/pistache",
"supports": "linux"
"supports": "linux",
"dependencies": [
"rapidjson"
]
}
8 changes: 0 additions & 8 deletions scripts/ci.baseline.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1214,14 +1214,6 @@ pfring:x64-osx=fail
pfring:x64-linux=fail
physx:arm64-windows=fail
piex:x64-osx=fail
pistache:arm64-windows=fail
pistache:arm-uwp=fail
pistache:x64-osx=fail
pistache:x64-uwp=fail
pistache:x64-windows=fail
pistache:x64-windows-static=fail
pistache:x64-windows-static-md=fail
pistache:x86-windows=fail
pixel:x64-uwp=fail
pixel:x64-windows=fail
pixel:x64-windows-static=fail
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4890,7 +4890,7 @@
},
"pistache": {
"baseline": "2021-03-31",
"port-version": 1
"port-version": 2
},
"pixel": {
"baseline": "0.3-1",
Expand Down
5 changes: 5 additions & 0 deletions versions/p-/pistache.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "e8c089b0eec0784be71fb4347dbd583c4aaeb0d8",
"version-date": "2021-03-31",
"port-version": 2
},
{
"git-tree": "c6b15d3a79abbfb78408d1f49e8b976bcb9003f2",
"version-date": "2021-03-31",
Expand Down