diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-08-27 14:47:45 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-09-03 21:35:06 +0200 |
| commit | 60f36007a361f4102a9cc0ceb65040ebc19d2653 (patch) | |
| tree | 3700819941ce1b39a8fdc1b985b59cc3ec0e40e0 /cmake/QtBuild.cmake | |
| parent | 4d8fb1bc6f8b57952f930e293d79ffbfc0b0701e (diff) | |
CMake: Don't cache QT_SYNCQT across builds
There is no need for this variable to be stored in CMake's cache. We
don't perform expensive operations to set up QT_SYNCQT, and we even
unset the cache variable to ensure it gets recomputed on
reconfiguration.
We still store QT_SYNCQT in a global property, because the function
qt_ensure_sync_qt is called in different directory scopes, and we want
to avoid re-calculations for every subdir.
It's now possible for the user to set QT_SYNCQT (see QTBUG-88088 for
motivation). Also, in a non-prefix build, changes to syncqt.pl in the
source dir are reflected upon re-configuration in the build
tree (because qt_copy_or_install is called on every configure).
Pick-to: 6.2
Fixes: QTBUG-88088
Task-number: QTBUG-75290
Change-Id: I6137b060d200d3dafd4a64d5a6c1bd2549723d78
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'cmake/QtBuild.cmake')
| -rw-r--r-- | cmake/QtBuild.cmake | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake index f89512ae58..ec3f25ca4f 100644 --- a/cmake/QtBuild.cmake +++ b/cmake/QtBuild.cmake @@ -401,10 +401,6 @@ qt_internal_set_qt_known_plugins("") set(QT_KNOWN_MODULES_WITH_TOOLS "" CACHE INTERNAL "Known Qt modules with tools" FORCE) -# Reset syncqt cache variable, to make sure it gets recomputed on reconfiguration, otherwise -# it might not get installed. -unset(QT_SYNCQT CACHE) - # For adjusting variables when running tests, we need to know what # the correct variable is for separating entries in PATH-alike # variables. |