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
5 changes: 0 additions & 5 deletions ports/pistache/CONTROL

This file was deleted.

36 changes: 36 additions & 0 deletions ports/pistache/fix-debug-empty.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9aeed1e..7316732 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -48,12 +48,12 @@ if (BUILD_SHARED_LIBS)
add_library(pistache_shared SHARED $<TARGET_OBJECTS:pistache>)
target_link_libraries(pistache_shared PRIVATE Threads::Threads ${CMAKE_REQUIRED_LIBRARIES})
target_include_directories(pistache_shared INTERFACE ${PISTACHE_INCLUDE})
-endif ()
+else ()

add_library(pistache_static STATIC $<TARGET_OBJECTS:pistache>)
target_link_libraries(pistache_static PRIVATE Threads::Threads ${CMAKE_REQUIRED_LIBRARIES})
target_include_directories(pistache_static INTERFACE ${PISTACHE_INCLUDE})
-
+endif()
if (PISTACHE_USE_SSL)
target_compile_definitions(pistache PUBLIC PISTACHE_USE_SSL)
target_compile_definitions(pistache_static PUBLIC PISTACHE_USE_SSL)
@@ -72,8 +72,15 @@ if (BUILD_SHARED_LIBS)
OUTPUT_NAME ${Pistache_OUTPUT_NAME}-${VERSION}
SOVERSION ${SONAME_VERSION_MAJOR}.${SONAME_VERSION_MINOR}
)
-endif ()
+else ()

set_target_properties(pistache_static PROPERTIES
OUTPUT_NAME ${Pistache_OUTPUT_NAME}
)
+endif()
+install(
+ TARGETS pistache
+ RUNTIME DESTINATION bin
+ LIBRARY DESTINATION lib
+ ARCHIVE DESTINATION lib
+)
18 changes: 9 additions & 9 deletions ports/pistache/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
if(NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux")
if(NOT VCPKG_TARGET_IS_LINUX)
message(FATAL_ERROR "${PORT} currently only supports Linux platform.")
endif()

vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO oktal/pistache
REF 4dc9e3ef9a1b953a62e5fadbed88e72b4b3734de
SHA512 427b6a6e7200e5f91ce8737cd1cc5d6cd689025033c85979c96f0ece64ae05d9c6839a936d7d6015b0e1065dc72362f6f70ab588ea7cae7aa718dfe5cd288554
REPO pistacheio/pistache
REF 9dc080b9ebbe6fc1726b45e9db1550305938313e #2021-03-31
SHA512 b55c395fb98af85317590ed2502564af5e92e30a35618132568c6ab589a6d0971570ad20ddbd1f49d9dd8cf54692866c69cfc1350c6fdccf9efb039aacf153b4
HEAD_REF master
PATCHES
fix-debug-empty.patch
)

vcpkg_configure_cmake(
Expand All @@ -17,13 +19,11 @@ vcpkg_configure_cmake(

vcpkg_install_cmake()

vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT})
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/lib/pkgconfig)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/pkgconfig)

# Handle copyright
file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright)
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
7 changes: 7 additions & 0 deletions ports/pistache/vcpkg.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"name": "pistache",
"version-date": "2021-03-31",
"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"
}
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -4849,7 +4849,7 @@
"port-version": 0
},
"pistache": {
"baseline": "2019-08-05",
"baseline": "2021-03-31",
"port-version": 0
},
"pixel": {
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": "f2c28dea6191ea1f399a862889d095f1d268a3f0",
"version-date": "2021-03-31",
"port-version": 0
},
{
"git-tree": "63fa37bfa9925b106a2e5a66db9133e381dc499e",
"version-string": "2019-08-05",
Expand Down