diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-04-07 16:10:23 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-04-08 15:14:09 +0200 |
| commit | bb5a505d434f2209344b482de45a896bbdbc2077 (patch) | |
| tree | 324ea55f2a8b76d239c0cf1a0c25573ad1003a01 /mkspecs | |
| parent | 5422fb79486a1818d6355d75f019fe63120a43d0 (diff) | |
CMake/qmake: Fix qtIsPrefixBuild for a CMake-built qtbase
In addition to .qmake.cache and .qmake.super we check for the
existence of CMakeCache.txt. The top-level non-prefix build part is
prospective, but seems plausible.
Without this fix, non-prefix qmake builds build libs etc. in the wrong
locations, i.e. not in a subdirectory of qtbase.
Change-Id: Ic88efa6c772d49ef92713fe640f004c8a5c849d3
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/qt_prefix_build_check.prf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mkspecs/features/qt_prefix_build_check.prf b/mkspecs/features/qt_prefix_build_check.prf index 3f98847de9..5b21efa367 100644 --- a/mkspecs/features/qt_prefix_build_check.prf +++ b/mkspecs/features/qt_prefix_build_check.prf @@ -12,10 +12,10 @@ defineTest(qtIsPrefixBuild) { prefixdir = $$1 # qtbase non-prefix build? - exists($$prefixdir/.qmake.cache): \ + exists($$prefixdir/.qmake.cache)|exists($$prefixdir/CMakeCache.txt): \ return(false) # top-level non-prefix build? - contains(prefixdir, .*/qtbase):exists($$dirname(prefixdir)/.qmake.super): \ + contains(prefixdir, .*/qtbase):if(exists($$dirname(prefixdir)/.qmake.super)|exists($$dirname(prefixdir)/CMakeCache.txt)): \ return(false) return(true) } |