diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-07-22 17:30:24 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-07-22 16:02:21 +0000 |
| commit | f60e4058aa27d19fcbb5dbde3d179ccbc6655003 (patch) | |
| tree | 867665e889004b00fabc9c9015f67b4e0ee91383 /cmake/QtBuildInternalsExtra.cmake.in | |
| parent | 31341ad63abbf67fc6a058284e5f48c33a6c4e8f (diff) | |
Fix non-prefix builds for non qtbase repos
QT_WILL_INSTALL was previously always set to ON when doing a
qtdeclarative build, because
CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT evaluated to false due to
always having to set CMAKE_INSTALL_PREFIX to point to the qtbase build
directory.
Instead of recomputing the value of QT_WILL_INSTALL, compute it once
while configuring qtbase, and add it to the generated
QtBuildInternalsExtra.cmake file, so it propagates to all other repos
that will be built.
Change-Id: If8bf63e7501b5758fe7aa0f799cb0746704f4811
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'cmake/QtBuildInternalsExtra.cmake.in')
| -rw-r--r-- | cmake/QtBuildInternalsExtra.cmake.in | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/cmake/QtBuildInternalsExtra.cmake.in b/cmake/QtBuildInternalsExtra.cmake.in index 028cfe2717..6f070ed043 100644 --- a/cmake/QtBuildInternalsExtra.cmake.in +++ b/cmake/QtBuildInternalsExtra.cmake.in @@ -15,3 +15,7 @@ set(CMAKE_INSTALL_PREFIX @CMAKE_INSTALL_PREFIX@ CACHE PATH if(@FEATURE_developer_build@) set(FEATURE_developer_build ON CACHE BOOL "Developer build." FORCE) endif() + +# Propagate non-prefix builds. +set(QT_WILL_INSTALL @QT_WILL_INSTALL@ CACHE BOOL + "Boolean indicating if doing a Qt prefix build (vs non-prefix build)." FORCE) |