From cb95046f09d1f6663a97b1917e98b3d69d36d509 Mon Sep 17 00:00:00 2001
From: autoantwort <41973254+autoantwort@users.noreply.github.com>
Date: Thu, 4 Nov 2021 18:40:39 +0100
Subject: [PATCH] [qpid-proton] no absolute paths (#21167)

---
 ports/qpid-proton/portfile.cmake | 33 +++++++++++---------------------
 ports/qpid-proton/vcpkg.json     | 12 ++++++++++--
 versions/baseline.json           |  2 +-
 versions/q-/qpid-proton.json     |  5 +++++
 4 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/ports/qpid-proton/portfile.cmake b/ports/qpid-proton/portfile.cmake
index e8a9114625..2d206def12 100644
--- a/ports/qpid-proton/portfile.cmake
+++ b/ports/qpid-proton/portfile.cmake
@@ -10,9 +10,8 @@ vcpkg_from_github(
     HEAD_REF next
 )
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         -DPYTHON_EXECUTABLE=${PYTHON3}
         -DLIB_SUFFIX=
@@ -23,27 +22,17 @@ vcpkg_configure_cmake(
         -DCMAKE_DISABLE_FIND_PACKAGE_CyrusSASL=ON
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 
 vcpkg_copy_pdbs()
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake)
+vcpkg_fixup_pkgconfig()
 
-file(GLOB SHARE_DIR ${CURRENT_PACKAGES_DIR}/share/*)
-file(RENAME ${SHARE_DIR} ${CURRENT_PACKAGES_DIR}/share/${PORT})
+file(RENAME "${CURRENT_PACKAGES_DIR}/share/proton/LICENSE.txt"
+            "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright")
 
-file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/lib/cmake/tmp)
-file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/lib/cmake/tmp)
-file(RENAME ${CURRENT_PACKAGES_DIR}/lib/cmake/Proton ${CURRENT_PACKAGES_DIR}/lib/cmake/tmp/Proton)
-file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/cmake/Proton ${CURRENT_PACKAGES_DIR}/debug/lib/cmake/tmp/Proton)
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/tmp/Proton TARGET_PATH share/proton)
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/ProtonCpp TARGET_PATH share/protoncpp)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/proton")
 
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE.txt
-            ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright)
-
-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)
-file(REMOVE ${CURRENT_PACKAGES_DIR}/share/qpid-proton/CMakeLists.txt)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/qpid-proton/tests)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/qpid-proton/examples)
+vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/proton/version.h" "#define PN_INSTALL_PREFIX \"${CURRENT_PACKAGES_DIR}\"" "")
diff --git a/ports/qpid-proton/vcpkg.json b/ports/qpid-proton/vcpkg.json
index 04bbec9af0..cbdd7e4ecd 100644
--- a/ports/qpid-proton/vcpkg.json
+++ b/ports/qpid-proton/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "qpid-proton",
-  "version-string": "0.32.0",
-  "port-version": 1,
+  "version": "0.32.0",
+  "port-version": 2,
   "description": "Qpid Proton is a high-performance, lightweight messaging library.",
   "homepage": "https://github.com/apache/qpid-proton",
   "dependencies": [
@@ -13,6 +13,14 @@
     {
       "name": "openssl",
       "platform": "!windows & !uwp"
+    },
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
     }
   ]
 }
diff --git a/versions/baseline.json b/versions/baseline.json
index 0d67d2680c..a13b14084a 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5422,7 +5422,7 @@
     },
     "qpid-proton": {
       "baseline": "0.32.0",
-      "port-version": 1
+      "port-version": 2
     },
     "qscintilla": {
       "baseline": "2.12.0",
diff --git a/versions/q-/qpid-proton.json b/versions/q-/qpid-proton.json
index faf43e1c79..82017e48c4 100644
--- a/versions/q-/qpid-proton.json
+++ b/versions/q-/qpid-proton.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "c6ab0bd896fa44681e2c3d4b325915ddacb38a1a",
+      "version": "0.32.0",
+      "port-version": 2
+    },
     {
       "git-tree": "b8fcc3b90edf020392d7fb1375c252b932a5e2be",
       "version-string": "0.32.0",