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 <[email protected]>
wukh0312 · Jul 16, 2020 · 044cb3c · 044cb3c
1 parent b2504af
commit 044cb3c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git 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
@@ -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"