diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2022-02-02 17:24:59 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2022-02-03 21:21:29 +0100 |
| commit | acaba632605ac22aa3da4c3cf8e5891cb9cde657 (patch) | |
| tree | 905e8ec5a9794311df80d94c96cc21b879e1789f | |
| parent | 7cb2bbd9e765bd90a2df06c7256d0306d669fbe6 (diff) | |
configure: Raise error if -skip/-submodules is used in per-repo build
Specifying the options would do nothing, so it's better to error out
early in case the developer accidentally added them.
Pick-to: 6.2 6.3
Change-Id: Ia516468a22c3c48e9e84dc78e522e8870186d96b
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
| -rw-r--r-- | cmake/QtProcessConfigureArgs.cmake | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/cmake/QtProcessConfigureArgs.cmake b/cmake/QtProcessConfigureArgs.cmake index b3ecefabad..9b9c105d58 100644 --- a/cmake/QtProcessConfigureArgs.cmake +++ b/cmake/QtProcessConfigureArgs.cmake @@ -34,6 +34,14 @@ function(is_non_empty_valid_arg arg value) endif() endfunction() +function(error_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.") + endif() +endfunction() + if("${MODULE_ROOT}" STREQUAL "") # If MODULE_ROOT is not set, assume that we want to build qtbase or top-level. get_filename_component(MODULE_ROOT ".." ABSOLUTE BASE_DIR "${CMAKE_CURRENT_LIST_DIR}") @@ -85,6 +93,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}") list(POP_FRONT configure_args qtrepos) is_non_empty_valid_arg("${arg}" "${qtrepos}") list(TRANSFORM qtrepos REPLACE "," ";") @@ -92,6 +101,7 @@ while(NOT "${configure_args}" STREQUAL "") push("-DBUILD_${qtrepo}=OFF") endforeach() elseif(arg STREQUAL "-submodules") + error_in_per_repo_build("${arg}") list(POP_FRONT configure_args submodules) is_non_empty_valid_arg("${arg}" "${submodules}") list(TRANSFORM submodules REPLACE "," "[[;]]") |