[qt5-base] no _debug lib suffixes on macOS (#14225) (#21695)

* [qt5-base] no _debug lib suffixes on macOS (#14225) * [qt5-base] patch qt5-base to remove _debug postfix on osx * Apply suggestions from code review Co-authored-by: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> * [qt5-base] create link to _debug.pc file from .pc file without _debug * update version * [qt5-base] create forward pkgconfig file Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com> Co-authored-by: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com>
microsoft · Dec 16, 2021 · 0d0547a · 0d0547a
1 parent 24c6283
commit 0d0547a
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 2 deletions.
diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake
@@ -506,6 +506,16 @@ endif()
 
 vcpkg_fixup_pkgconfig()
 
+if(VCPKG_TARGET_IS_OSX)
+    file(GLOB _debug_files "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/*_debug.pc")
+    foreach(_file ${_debug_files})
+        string(REGEX REPLACE "_debug\\.pc$" ".pc" _new_filename "${_file}")
+        string(REGEX MATCH "(Qt5[a-zA-Z]+)_debug\\.pc$" _not_used "${_file}")
+        set(_name ${CMAKE_MATCH_1})
+        file(STRINGS "${_file}" _version REGEX "^(Version):.+$")
+        file(WRITE "${_new_filename}" "Name: ${_name}\nDescription: Forwarding to the _debug version by vcpkg\n${_version}\nRequires: ${_name}_debug\n")
+    endforeach()
+endif()
 # #Code to get generated CMake files from CI
 # file(RENAME "${CURRENT_PACKAGES_DIR}/share/cmake/Qt5Core/Qt5CoreConfig.cmake" "${CURRENT_BUILDTREES_DIR}/Qt5CoreConfig.cmake.log")
 # file(GLOB_RECURSE CMAKE_GUI_FILES "${CURRENT_PACKAGES_DIR}/share/cmake/Qt5Gui/*.cmake" )

diff --git a/ports/qt5-base/vcpkg.json b/ports/qt5-base/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "qt5-base",
   "version-semver": "5.15.2",
-  "port-version": 18,
+  "port-version": 19,
   "description": "Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.",
   "homepage": "https://www.qt.io/",
   "dependencies": [

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -5534,7 +5534,7 @@
     },
     "qt5-base": {
       "baseline": "5.15.2",
-      "port-version": 18
+      "port-version": 19
     },
     "qt5-canvas3d": {
       "baseline": "0",

diff --git a/versions/q-/qt5-base.json b/versions/q-/qt5-base.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "5a9c2b85fd5f62bb1b52f18c4628b0e08d765dd4",
+      "version-semver": "5.15.2",
+      "port-version": 19
+    },
     {
       "git-tree": "5793fff5370499ba464430142f86b971a23dff25",
       "version-semver": "5.15.2",