From 044cb3ce20c3b29c0bd441a0575fa05a8d48ebae Mon Sep 17 00:00:00 2001
From: Joerg Bornemann <joerg.bornemann@qt.io>
Date: Thu, 16 Jul 2020 13:27:30 +0200
Subject: CMake: Fix top-level configure

The working directory for CMake must be the top-level build dir, not the
qtbase one.

Change-Id: I1090aca8bf2617719e724f96b1fa356eb9fabb46
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
---
 configure     | 14 ++++++++++----
 configure.bat |  3 ++-
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/configure b/configure
index 2ea6f92473..42d12a707b 100755
--- a/configure
+++ b/configure
@@ -921,13 +921,19 @@ if [ "$BUILD_WITH_CMAKE" = "yes" ]; then
     checkTopLevelBuild "$@"
     getOptAndQMakeCmdLines "$@"
     if [ -z "$optfile" ]; then   # only write optfile if not currently redoing
-        optfile=${outpathPrefix}config.opt
-        if [ -f "$optfile" ]; then rm "$optfile"; fi
+        optfilename=config.opt
+        optfilepath=${outpathPrefix}${optfilename}
+        if [ -f "$optfilepath" ]; then rm "$optfilepath"; fi
         for arg in "$@"; do
-            echo $arg >> "$optfile"
+            echo $arg >> "$optfilepath"
         done
     fi
-    cmake "-DOPTFILE=$optfile" -P "$relpath/cmake/QtProcessConfigureArgs.cmake"
+
+    if [ -n "$CFG_TOPLEVEL" ]; then
+        cd ..
+    fi
+
+    cmake "-DOPTFILE=$optfilename" -P "$relpath/cmake/QtProcessConfigureArgs.cmake"
 else
     findPerl
     findAwk
diff --git a/configure.bat b/configure.bat
index f5f4a2b4cc..4bb78f9069 100644
--- a/configure.bat
+++ b/configure.bat
@@ -315,4 +315,5 @@ if "%rargs%" == "" (
 )
 
 rem Launch CMake-based configure
-cmake -DOPTFILE="%TOPQTDIR%\config.opt" -P "%QTSRC%\cmake\QtProcessConfigureArgs.cmake"
+cd "%TOPQTDIR%"
+cmake -DOPTFILE=config.opt -P "%QTSRC%\cmake\QtProcessConfigureArgs.cmake"
-- 
cgit v1.2.3