From bca99c46b00674e9e1974ca0fee967c03b5f8c5e Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Mon, 21 Mar 2022 20:31:03 +0100 Subject: [PATCH] [qhttpengine] no absolute paths (#22328) --- ports/qhttpengine/portfile.cmake | 5 +++++ ports/qhttpengine/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/q-/qhttpengine.json | 5 +++++ 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ports/qhttpengine/portfile.cmake b/ports/qhttpengine/portfile.cmake index 5a59f0ce84..3d744bc173 100644 --- a/ports/qhttpengine/portfile.cmake +++ b/ports/qhttpengine/portfile.cmake @@ -17,6 +17,11 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_copy_pdbs() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake) +if(VCPKG_TARGET_IS_WINDOWS) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") +else() + vcpkg_fixup_pkgconfig() +endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/qhttpengine/vcpkg.json b/ports/qhttpengine/vcpkg.json index 9e554e1e50..f1762479d4 100644 --- a/ports/qhttpengine/vcpkg.json +++ b/ports/qhttpengine/vcpkg.json @@ -1,6 +1,7 @@ { "name": "qhttpengine", "version": "1.0.2", + "port-version": 1, "description": "HTTP server for Qt applications", "supports": "!uwp", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index fc99da0295..b7f30e46fe 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5598,7 +5598,7 @@ }, "qhttpengine": { "baseline": "1.0.2", - "port-version": 0 + "port-version": 1 }, "qhull": { "baseline": "8.0.2", diff --git a/versions/q-/qhttpengine.json b/versions/q-/qhttpengine.json index 7ce14ff67e..16d3df94ee 100644 --- a/versions/q-/qhttpengine.json +++ b/versions/q-/qhttpengine.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "df41e64df52df962bbd8836762d3946358819690", + "version": "1.0.2", + "port-version": 1 + }, { "git-tree": "7981cbfcf13bef7cfede8cf40a9d69967cc63dfb", "version": "1.0.2",