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>

1 files changed, 10 insertions, 4 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