[qt5] Fix pkg-config setup in qt5-base (microsoft#27404)

* [qt5] fix pkg-config search path and save qmake config.log * v db
SupSuper · Oct 24, 2022 · 4aac676 · 4aac676
1 parent a329367
commit 4aac676
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 6 deletions.
diff --git a/ports/qt5-base/cmake/configure_qt.cmake b/ports/qt5-base/cmake/configure_qt.cmake
@@ -111,10 +111,10 @@ function(configure_qt)
     vcpkg_add_to_path("${PKGCONFIG_PATH}")
 
     foreach(_buildname ${BUILDTYPES})
-        set(PKGCONFIG_INSTALLED_DIR "${_VCPKG_INSTALLED_PKGCONF}${_path_suffix_${_buildname}}/lib/pkgconfig")
-        set(PKGCONFIG_INSTALLED_SHARE_DIR "${_VCPKG_INSTALLED_PKGCONF}/share/pkgconfig")
-        set(PKGCONFIG_PACKAGES_DIR "${_VCPKG_PACKAGES_PKGCONF}${_path_suffix_${_buildname}}/lib/pkgconfig")
-        set(PKGCONFIG_PACKAGES_SHARE_DIR "${_VCPKG_PACKAGES_PKGCONF}/share/pkgconfig")
+        set(PKGCONFIG_INSTALLED_DIR "${CURRENT_INSTALLED_DIR}${_path_suffix_${_buildname}}/lib/pkgconfig")
+        set(PKGCONFIG_INSTALLED_SHARE_DIR "${CURRENT_INSTALLED_DIR}/share/pkgconfig")
+        set(PKGCONFIG_PACKAGES_DIR "${CURRENT_PACKAGES_DIR}${_path_suffix_${_buildname}}/lib/pkgconfig")
+        set(PKGCONFIG_PACKAGES_SHARE_DIR "${CURRENT_PACKAGES_DIR}/share/pkgconfig")
         if(DEFINED ENV{PKG_CONFIG_PATH})
             set(BACKUP_ENV_PKG_CONFIG_PATH_${_config} $ENV{PKG_CONFIG_PATH})
             set(ENV{PKG_CONFIG_PATH} "${PKGCONFIG_INSTALLED_DIR}${VCPKG_HOST_PATH_SEPARATOR}${PKGCONFIG_INSTALLED_SHARE_DIR}${VCPKG_HOST_PATH_SEPARATOR}${PKGCONFIG_PACKAGES_DIR}${VCPKG_HOST_PATH_SEPARATOR}${PKGCONFIG_PACKAGES_SHARE_DIR}${VCPKG_HOST_PATH_SEPARATOR}$ENV{PKG_CONFIG_PATH}")

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

diff --git a/scripts/cmake/vcpkg_configure_qmake.cmake b/scripts/cmake/vcpkg_configure_qmake.cmake
@@ -108,6 +108,7 @@ function(vcpkg_configure_qmake)
                     ${build_opt_param}
             WORKING_DIRECTORY "${current_binary_dir}"
             LOGNAME "config-${TARGET_TRIPLET}-rel"
+            SAVE_LOG_FILES config.log
         )
         message(STATUS "Configuring ${TARGET_TRIPLET}-rel done")
         if(EXISTS "${current_binary_dir}/config.log")
@@ -152,6 +153,7 @@ function(vcpkg_configure_qmake)
                     ${build_opt_param}
             WORKING_DIRECTORY "${current_binary_dir}"
             LOGNAME "config-${TARGET_TRIPLET}-dbg"
+            SAVE_LOG_FILES config.log
         )
         message(STATUS "Configuring ${TARGET_TRIPLET}-dbg done")
         if(EXISTS "${current_binary_dir}/config.log")

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -6038,7 +6038,7 @@
     },
     "qt5-base": {
       "baseline": "5.15.6",
-      "port-version": 1
+      "port-version": 2
     },
     "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": "33f9683e8ac31a95c1fa310e47990191b8c6387f",
+      "version": "5.15.6",
+      "port-version": 2
+    },
     {
       "git-tree": "7881b89de5ec007d8ea1cd868fd76dd74a2f08ad",
       "version": "5.15.6",