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

microsoft · Nov 27, 2021 · 87a1c35 · 87a1c35
1 parent b3cfaaf
commit 87a1c35
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 3 deletions.
diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake
@@ -504,7 +504,19 @@ if(QT_BUILD_LATEST)
     )
 endif()
 
-vcpkg_fixup_pkgconfig()
+if(NOT VCPKG_TARGET_IS_WINDOWS)
+    vcpkg_fixup_pkgconfig()
+endif()
+if(VCPKG_TARGET_IS_OSX)
+    file(GLOB_RECURSE _debug_files "${CURRENT_PACKAGES_DIR}/debug/lib/*_debug.*")
+    foreach(_file ${_debug_libs})
+        string(REPLACE "_debug" "" _new_filename "${_file}")
+        file(RENAME "${_file}" "${_new_filename}")
+        if(_new_filename MATCHES "*.(la|prl|pc)")
+            vcpkg_replace_string("${_new_filename}" "_debug" "")
+        endif()
+    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")

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": 16,
+  "port-version": 17,
   "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
@@ -5518,7 +5518,7 @@
     },
     "qt5-base": {
       "baseline": "5.15.2",
-      "port-version": 16
+      "port-version": 17
     },
     "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": "7c3312e6857115542e74a0bdbafc9028ff8c251c",
+      "version-semver": "5.15.2",
+      "port-version": 17
+    },
     {
       "git-tree": "5f510633de982d6e75e3d1170af23feedf208166",
       "version-semver": "5.15.2",