[pistache] fix install (#19206)

* [pistache] fix install

* fix ci.baseline.txt, versions

Co-authored-by: nicole mazzuca <mazzucan@outlook.com>

7 files changed, 13 insertions, 70 deletions

diff --git a/ports/pistache/disable-warnings.patch b/ports/pistache/disable-warnings.patch
deleted file mode 100644
index 717937ff8..000000000
--- a/ports/pistache/disable-warnings.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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)

diff --git a/ports/pistache/fix-debug-empty.patch b/ports/pistache/fix-debug-empty.patch
deleted file mode 100644
index f6a7b97a0..000000000
--- a/ports/pistache/fix-debug-empty.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-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

-+)

diff --git a/ports/pistache/portfile.cmake b/ports/pistache/portfile.cmake
index 9c50d2f00..089814ed3 100644
--- a/ports/pistache/portfile.cmake
+++ b/ports/pistache/portfile.cmake
@@ -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)
diff --git a/ports/pistache/vcpkg.json b/ports/pistache/vcpkg.json
index 0cac84c44..d627fc301 100644
--- a/ports/pistache/vcpkg.json
+++ b/ports/pistache/vcpkg.json
@@ -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"
+  ]
 }
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index 9fd0dd71c..fc573d8a3 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -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
diff --git a/versions/baseline.json b/versions/baseline.json
index 2c9ffc942..ac6056a82 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4890,7 +4890,7 @@
     },
     "pistache": {
       "baseline": "2021-03-31",
-      "port-version": 1
+      "port-version": 2
     },
     "pixel": {
       "baseline": "0.3-1",
diff --git a/versions/p-/pistache.json b/versions/p-/pistache.json
index bfdcc2db1..e7538a693 100644
--- a/versions/p-/pistache.json
+++ b/versions/p-/pistache.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "e8c089b0eec0784be71fb4347dbd583c4aaeb0d8",
+      "version-date": "2021-03-31",
+      "port-version": 2
+    },
+    {
       "git-tree": "c6b15d3a79abbfb78408d1f49e8b976bcb9003f2",
       "version-date": "2021-03-31",
       "port-version": 1