diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2019-09-23 12:04:54 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2019-09-23 10:51:45 +0000 |
| commit | 3ecfeb3629ab9628a6a52bb7a86e9e53af8595c2 (patch) | |
| tree | 181d026c454d5178ec06c00371a908f09ac2a395 /configure | |
| parent | 204765ba495529b21a2c7150ce3ec51b4738bc49 (diff) | |
Fix top-level builds with qmake
The separation of functionality into functions in commit
37756ede09402931758efc51072147a3ea73d961 accidentally broke top-level
builds as the function to detect -top-level was operating on local
parameters (shift) or they were not available ($1). Inlining these few
lines fixes it.
Change-Id: Icf609dc5e7b361997847f3ef3a1b10635c122d5d
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 30 |
1 files changed, 14 insertions, 16 deletions
@@ -96,21 +96,6 @@ fi # do this early so we don't store it in config.status CFG_TOPLEVEL= outpathPrefix= -checkTopLevelBuild() -{ -relpathMangled=$relpath -if [ x"$1" = x"-top-level" ]; then - CFG_TOPLEVEL=yes - relpathMangled=`dirname "$relpath"` - outpathPrefix=../ - shift -else - if [ -f ../.qmake.super ]; then - echo >&2 "ERROR: You cannot configure qtbase separately within a top-level build." - exit 1 - fi -fi -} CMAKE_CMDLINE= getCMakeCmdLine() @@ -982,7 +967,20 @@ else findAwk findMake checkQMakeEnv - checkTopLevelBuild + + relpathMangled=$relpath + if [ x"$1" = x"-top-level" ]; then + CFG_TOPLEVEL=yes + relpathMangled=`dirname "$relpath"` + outpathPrefix=../ + shift + else + if [ -f ../.qmake.super ]; then + echo >&2 "ERROR: You cannot configure qtbase separately within a top-level build." + exit 1 + fi + fi + getOptAndQMakeCmdLines $@ detectOperatingSystem maybeVerifyXcode |