Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 12 additions & 0 deletions ports/pistache/disable-warnings.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e051efa..9d65174 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,7 +13,6 @@ project (pistache

include(GNUInstallDirs)

-add_compile_options(-Wall -Wconversion -pedantic -Wextra -Wno-missing-field-initializers)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/CMakeModules)

include(CheckAtomic)
11 changes: 6 additions & 5 deletions ports/pistache/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,21 @@ vcpkg_from_github(
HEAD_REF master
PATCHES
fix-debug-empty.patch
disable-warnings.patch
)

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

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)
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)
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
1 change: 1 addition & 0 deletions ports/pistache/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "pistache",
"version-date": "2021-03-31",
"port-version": 1,
"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"
Expand Down
8 changes: 0 additions & 8 deletions scripts/ci.baseline.txt
Original file line number Diff line number Diff line change
Expand Up @@ -208,8 +208,6 @@ devicenameresolver:x64-windows-static=fail
dimcli:arm-uwp=fail
dimcli:x64-osx=fail
dimcli:x64-uwp=fail
# directxtex requires GCC 9 or later for linux support
directxtex:x64-linux=fail
discord-game-sdk:x64-windows-static=fail
discord-game-sdk:x64-windows-static-md=fail
discord-rpc:arm-uwp=fail
Expand Down Expand Up @@ -353,9 +351,6 @@ fuzzylite:x64-uwp=fail
gainput:arm-uwp=fail
gainput:x64-linux=fail
gainput:x64-uwp=fail

# Requires a more recent gcc than we have in the test lab
gamedev-framework:x64-linux=fail
gasol:arm64-windows=fail
gasol:arm-uwp=fail
gasol:x64-uwp=fail
Expand Down Expand Up @@ -1611,8 +1606,6 @@ v8:arm64-windows=fail
v8:arm-uwp=fail
v8:x64-osx=fail
v8:x64-uwp=fail
# The domain hosting vamp-sdk uses a newer root cert than is available in our linux CI
vamp-sdk:x64-linux=fail
vectorclass:arm64-windows=fail
vectorclass:arm-uwp=fail
vlpp:x64-osx=fail
Expand Down Expand Up @@ -1750,7 +1743,6 @@ libmicrohttpd:x64-windows-static-md=fail
libspatialite:x64-windows-static-md=fail
linenoise-ng:x64-windows-static-md=fail
mmloader:x64-windows-static-md=fail
mpg123:x64-windows-static-md=fail
netcdf-cxx4:x64-windows-static-md=fail
open62541:x64-windows-static-md=fail
openscap:x64-windows-static-md=fail
Expand Down
10 changes: 5 additions & 5 deletions versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -3120,14 +3120,14 @@
"baseline": "0.6.0-1",
"port-version": 0
},
"libebur128": {
"baseline": "1.2.6",
"port-version": 0
},
"libe57": {
"baseline": "1.1.312",
"port-version": 0
},
"libebur128": {
"baseline": "1.2.6",
"port-version": 0
},
"libepoxy": {
"baseline": "1.5.5",
"port-version": 0
Expand Down Expand Up @@ -4862,7 +4862,7 @@
},
"pistache": {
"baseline": "2021-03-31",
"port-version": 0
"port-version": 1
},
"pixel": {
"baseline": "0.3-1",
Expand Down
5 changes: 5 additions & 0 deletions versions/p-/pistache.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "c6b15d3a79abbfb78408d1f49e8b976bcb9003f2",
"version-date": "2021-03-31",
"port-version": 1
},
{
"git-tree": "f2c28dea6191ea1f399a862889d095f1d268a3f0",
"version-date": "2021-03-31",
Expand Down