[libgwenhywfar] no absolute paths (microsoft#22358)

armdevvel · Jan 6, 2022 · 98b9ea0 · 98b9ea0
1 parent 5be51c9
commit 98b9ea0
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "279d1ba6d5ca2068bcd117050cb0f3c464b2cb8f",
+      "version-semver": "5.6.0",
+      "port-version": 1
+    },
     {
       "git-tree": "5be9e6060d67e8aad23d1de86effb0ce52605ec4",
       "version-semver": "5.6.0",