From 98b9ea03f82b2588d5379c143ad2468bd986b167 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Thu, 6 Jan 2022 22:59:29 +0100 Subject: [PATCH] [libgwenhywfar] no absolute paths (#22358) --- ports/libgwenhywfar/portfile.cmake | 12 +++++++++--- ports/libgwenhywfar/vcpkg.json | 5 +++++ versions/baseline.json | 2 +- versions/l-/libgwenhywfar.json | 5 +++++ 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/ports/libgwenhywfar/portfile.cmake b/ports/libgwenhywfar/portfile.cmake index 553825fab4aa6e..44967ed7823d7a 100644 --- a/ports/libgwenhywfar/portfile.cmake +++ b/ports/libgwenhywfar/portfile.cmake @@ -55,13 +55,19 @@ vcpkg_copy_pdbs() vcpkg_fixup_pkgconfig() foreach(GUI IN LISTS FEATURES_GUI) - vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/gwengui-${GUI}-${VERSION_MAJOR}.${VERSION_MINOR} TARGET_PATH share/gwengui-${GUI}-${VERSION_MAJOR}.${VERSION_MINOR} DO_NOT_DELETE_PARENT_CONFIG_PATH) + vcpkg_cmake_config_fixup(PACKAGE_NAME gwengui-cpp CONFIG_PATH lib/cmake/gwengui-${GUI}-${VERSION_MAJOR}.${VERSION_MINOR} DO_NOT_DELETE_PARENT_CONFIG_PATH) endforeach() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/gwenhywfar-${VERSION_MAJOR}.${VERSION_MINOR}) +vcpkg_cmake_config_fixup(PACKAGE_NAME gwenhywfar CONFIG_PATH lib/cmake/gwenhywfar-${VERSION_MAJOR}.${VERSION_MINOR}) if ("tools" IN_LIST FEATURES) vcpkg_copy_tools(SEARCH_DIR ${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin TOOL_NAMES gct-tool gsa mklistdoc typemaker typemaker2 xmlmerge AUTO_CLEAN) -endif() +endif() + +# the `dir` variable is not used in the script +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/libgwenhywfar/bin/gwenhywfar-config" "dir=\"${CURRENT_INSTALLED_DIR}\"" "") +if(NOT VCPKG_BUILD_TYPE) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/libgwenhywfar/debug/bin/gwenhywfar-config" "dir=\"${CURRENT_INSTALLED_DIR}/debug\"" "") +endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/libgwenhywfar/vcpkg.json b/ports/libgwenhywfar/vcpkg.json index c02dca482b2d02..df3f0bfa3c8759 100644 --- a/ports/libgwenhywfar/vcpkg.json +++ b/ports/libgwenhywfar/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libgwenhywfar", "version-semver": "5.6.0", + "port-version": 1, "description": "A helper library for networking and security applications and libraries", "homepage": "https://www.aquamaniac.de/rdm/", "supports": "!windows", @@ -11,6 +12,10 @@ "features": [ "openssl" ] + }, + { + "name": "vcpkg-cmake-config", + "host": true } ], "default-features": [ diff --git a/versions/baseline.json b/versions/baseline.json index 84d6f142e761a5..522326a4fada7b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3526,7 +3526,7 @@ }, "libgwenhywfar": { "baseline": "5.6.0", - "port-version": 0 + "port-version": 1 }, "libgxps": { "baseline": "0.3.2", diff --git a/versions/l-/libgwenhywfar.json b/versions/l-/libgwenhywfar.json index 1983969253d0ac..8449e9141f69d7 100644 --- a/versions/l-/libgwenhywfar.json +++ b/versions/l-/libgwenhywfar.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "279d1ba6d5ca2068bcd117050cb0f3c464b2cb8f", + "version-semver": "5.6.0", + "port-version": 1 + }, { "git-tree": "5be9e6060d67e8aad23d1de86effb0ce52605ec4", "version-semver": "5.6.0",