summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexey Edelev <alexey.edelev@qt.io>2022-11-23 12:40:45 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-11-23 18:32:27 +0000
commit517d0890f9e95c841bea3421f2455651ca0d8070 (patch)
treee4d6cd08825b4ca7f55b5d64633445e8b02056d0
parent1cab37091261174e5586cbaf754a7c8a404bcf7a (diff)
Fix Linux build with CMake versions >= 3.25
The 'LINUX' variable exists in CMake since the version 3.25. This variable previously was undefined while preparsing the configure.cmake files. Since the CMake script that defines the 'check_for_ulimit' function is not included while evaluating configure.cmake first time we need to add a stub. Change-Id: I25bdec4f4a1b6af23174507a8f0f9cbf01f0c398 Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 240e71877865ed07e4c8d5bd4553aa0772c2adf4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--configure.cmake2
1 files changed, 2 insertions, 0 deletions
diff --git a/configure.cmake b/configure.cmake
index f485c1b4b..fff76d54a 100644
--- a/configure.cmake
+++ b/configure.cmake
@@ -3,6 +3,8 @@ if(QT_CONFIGURE_RUNNING)
endfunction()
function(add_check_for_support)
endfunction()
+ function(check_for_ulimit)
+ endfunction()
else()
find_package(Ninja 1.7.2)
find_package(Gn ${QT_REPO_MODULE_VERSION} EXACT)