diff options
-rw-r--r-- | .cmake.conf | 2 | ||||
-rw-r--r-- | cmake/QtCMakeVersionHelpers.cmake | 10 |
2 files changed, 11 insertions, 1 deletions
diff --git a/.cmake.conf b/.cmake.conf index b470bd0d02..8744479d6f 100644 --- a/.cmake.conf +++ b/.cmake.conf @@ -1,7 +1,7 @@ set(QT_REPO_MODULE_VERSION "6.1.0") # Minimum requirement for building Qt -set(QT_MIN_SUPPORTED_CMAKE_VERSION "3.18") +set(QT_MIN_SUPPORTED_CMAKE_VERSION "3.16") # Policy settings for commands defined by qtbase. These will also be injected # into the top level policy scope of each Qt module when building Qt so that diff --git a/cmake/QtCMakeVersionHelpers.cmake b/cmake/QtCMakeVersionHelpers.cmake index aca1c50206..955d9044cb 100644 --- a/cmake/QtCMakeVersionHelpers.cmake +++ b/cmake/QtCMakeVersionHelpers.cmake @@ -124,6 +124,16 @@ function(qt_internal_warn_about_unsuitable_cmake_versions) "CMake version used: '${unsuitable_version}'") endif() endforeach() + + # Ninja Multi-Config was introduced in 3.17, but we recommend 3.18. + set(min_nmc_cmake_version "3.18.3") + if(CMAKE_GENERATOR STREQUAL "Ninja Multi-Config" + AND CMAKE_VERSION VERSION_LESS ${min_nmc_cmake_version}) + message(WARNING + "You are using CMake ${CMAKE_VERSION} with the Ninja Multi-Config generator. " + "This combination is unsupported. " + "Please upgrade to at least CMake ${min_nmc_cmake_version}. ") + endif() endfunction() # Functions don't have their own policy scope, so the policy settings modified |