diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2022-02-07 12:02:06 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2022-02-09 15:33:46 +0100 |
| commit | 94b158134c8819c74ccddd2c8877a44c12f1c4c9 (patch) | |
| tree | faa5d6bc67c6341e458c1bf81edebbafe549221e /cmake/QtProcessConfigureArgs.cmake | |
| parent | 76bdbeb862f64aa8b8773b5183d28b3eb1bbfc8a (diff) | |
configure: Switch error to warning when -skip used in per-repo build
Yield a warning instead of an error that -skip and -submodules have
no effect in a per-repo build.
Amends acaba632605ac22aa3da4c3cf8e5891cb9cde657
Adjusts to 11ae0e772cccd3028771c1380f077c605224cc19
Pick-to: 6.2 6.3
Change-Id: Ic26b0ba29e48be5162f13ad75308f8358d8878e3
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'cmake/QtProcessConfigureArgs.cmake')
| -rw-r--r-- | cmake/QtProcessConfigureArgs.cmake | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/cmake/QtProcessConfigureArgs.cmake b/cmake/QtProcessConfigureArgs.cmake index 9b9c105d58..3396731356 100644 --- a/cmake/QtProcessConfigureArgs.cmake +++ b/cmake/QtProcessConfigureArgs.cmake @@ -34,11 +34,9 @@ function(is_non_empty_valid_arg arg value) endif() endfunction() -function(error_in_per_repo_build arg) +function(warn_in_per_repo_build arg) if(NOT TOP_LEVEL) - message(FATAL_ERROR - "Using option '${arg}' is not allowed in a per-repo build, it only " - "works in a top-level build.") + message(WARNING "Command line option ${arg} is only effective in top-level builds") endif() endfunction() @@ -93,7 +91,7 @@ while(NOT "${configure_args}" STREQUAL "") elseif(arg STREQUAL "-write-options-for-conan") list(POP_FRONT configure_args options_json_file) elseif(arg STREQUAL "-skip") - error_in_per_repo_build("${arg}") + warn_in_per_repo_build("${arg}") list(POP_FRONT configure_args qtrepos) is_non_empty_valid_arg("${arg}" "${qtrepos}") list(TRANSFORM qtrepos REPLACE "," ";") @@ -101,7 +99,7 @@ while(NOT "${configure_args}" STREQUAL "") push("-DBUILD_${qtrepo}=OFF") endforeach() elseif(arg STREQUAL "-submodules") - error_in_per_repo_build("${arg}") + warn_in_per_repo_build("${arg}") list(POP_FRONT configure_args submodules) is_non_empty_valid_arg("${arg}" "${submodules}") list(TRANSFORM submodules REPLACE "," "[[;]]") |