summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt CI Bot <qt_ci_bot@qt-project.org>2021-04-17 13:47:06 +0000
committerQt CI Bot <qt_ci_bot@qt-project.org>2021-04-17 13:47:06 +0000
commitec7ff5cede92412b929ff30207b0eeafce93ee3b (patch)
tree330e51993288b56f91ffa365ec35febf208db91c
parent7b7a6050e7f033d232de3afa77c33bbf0580b093 (diff)
parentaab8a0ac6e5365d97d3c7571b26430776b7b5f49 (diff)
Merge integration refs/builds/qtci/dev/1618660601
-rw-r--r--cmake/QtCMakeVersionHelpers.cmake6
1 files changed, 6 insertions, 0 deletions
diff --git a/cmake/QtCMakeVersionHelpers.cmake b/cmake/QtCMakeVersionHelpers.cmake
index 944060d15c..4d4113bb43 100644
--- a/cmake/QtCMakeVersionHelpers.cmake
+++ b/cmake/QtCMakeVersionHelpers.cmake
@@ -121,6 +121,12 @@ function(qt_internal_warn_about_unsuitable_cmake_versions)
# https://gitlab.kitware.com/cmake/cmake/-/issues/21977
list(APPEND unsuitable_versions "3.20.0")
+ # AUTOMOC can crash or hang when using a Qt that supports moc depfiles.
+ # Issues reported on Windows with Ninja and Makefiles, but it could be happening
+ # on other platforms too.
+ # https://gitlab.kitware.com/cmake/cmake/-/issues/22014
+ list(APPEND unsuitable_versions "3.20.1")
+
foreach(unsuitable_version ${unsuitable_versions})
if(CMAKE_VERSION VERSION_EQUAL unsuitable_version)
message(WARNING