1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add configure mappings for QT_BUILD_<TESTS|EXAMPLES>_PROJECT

Browse Source 
Change-Id: I1e9f877c4c9b6257f4f90e3361d5a0226e62e841
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 7c9efdf40c9d9f7f89f7a9be0c06e0d3ec54ec2c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Alexey Edelev 2024-02-07 14:26:45 +01:00 committed by Qt Cherry-pick Bot
parent 72cc294156
commit c3aa052942
3 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cmake/QtProcessConfigureArgs.cmake
View File

@ -110,6 +110,20 @@ while(NOT "${configure_args}" STREQUAL "")
foreach(qtrepo IN LISTS qtrepos) foreach(qtrepo IN LISTS qtrepos)
push("-DBUILD_${qtrepo}=OFF") push("-DBUILD_${qtrepo}=OFF")
endforeach() endforeach()
elseif(arg STREQUAL "-skip-tests")
list(POP_FRONT configure_args qtrepos)
is_non_empty_valid_arg("${arg}" "${qtrepos}")
list(TRANSFORM qtrepos REPLACE "," ";")
foreach(qtrepo IN LISTS qtrepos)
push("-DQT_BUILD_TESTS_PROJECT_${qtrepo}=OFF")
endforeach()
elseif(arg STREQUAL "-skip-examples")
list(POP_FRONT configure_args qtrepos)
is_non_empty_valid_arg("${arg}" "${qtrepos}")
list(TRANSFORM qtrepos REPLACE "," ";")
foreach(qtrepo IN LISTS qtrepos)
push("-DQT_BUILD_EXAMPLES_PROJECT_${qtrepo}=OFF")
endforeach()
elseif(arg STREQUAL "-submodules") elseif(arg STREQUAL "-submodules")
warn_in_per_repo_build("${arg}") warn_in_per_repo_build("${arg}")
list(POP_FRONT configure_args submodules) list(POP_FRONT configure_args submodules)

2
cmake/configure-cmake-mapping.md
View File

@ -93,6 +93,8 @@ The following table describes the mapping of configure options to CMake argument
| -android-javac-source | -DQT_ANDROID_JAVAC_SOURCE=7 | Set the javac build source version. | | -android-javac-source | -DQT_ANDROID_JAVAC_SOURCE=7 | Set the javac build source version. |
| -android-javac-target | -DQT_ANDROID_JAVAC_TARGET=7 | Set the javac build target version. | | -android-javac-target | -DQT_ANDROID_JAVAC_TARGET=7 | Set the javac build target version. |
| -skip <repo>,...,<repo_n> | -DBUILD_<repo>=OFF | | | -skip <repo>,...,<repo_n> | -DBUILD_<repo>=OFF | |
| -skip-tests <repo>,...,<repo_n> | -DQT_BUILD_TESTS_PROJECT_<repo>=OFF | |
| -skip-examples <repo>,...,<repo_n> | -DQT_BUILD_EXAMPLES_PROJECT_<repo>=OFF | |
| -submodules <repo>,...,<repo_n> | -DQT_BUILD_SUBMODULES=<repo>;...;<repo> | | | -submodules <repo>,...,<repo_n> | -DQT_BUILD_SUBMODULES=<repo>;...;<repo> | |
| -make <part> | -DQT_BUILD_TESTS=ON | A way to turn on tools explicitly is missing. If tests/examples | | -make <part> | -DQT_BUILD_TESTS=ON | A way to turn on tools explicitly is missing. If tests/examples |
| | -DQT_BUILD_EXAMPLES=ON | are enabled, you can disable their building as part of the | | | -DQT_BUILD_EXAMPLES=ON | are enabled, you can disable their building as part of the |

6
config_help.txt
View File

@ -196,6 +196,12 @@ Component selection:
-skip <repo>[,<repo>] Exclude one or more entire repositories from the -skip <repo>[,<repo>] Exclude one or more entire repositories from the
build. The list should be separated with commas. build. The list should be separated with commas.
e.g. -skip qtimageformats,qtsvg e.g. -skip qtimageformats,qtsvg
-skip-tests <repo>[,<repo>] ... Skip building tests for one or more
repositories. The list should be separated with commas.
e.g. -skip-tests qtimageformats,qtsvg
-skip-examples <repo>[,<repo>] ... Skip building examples for one or more
repositories. The list should be separated with commas.
e.g. -skip-examples qtimageformats,qtsvg
-make <part> ......... Add <part> to the list of parts to be built. -make <part> ......... Add <part> to the list of parts to be built.
Specifying this option clears the default list first. Specifying this option clears the default list first.
(allowed values: libs, tools, examples, tests, (allowed values: libs, tools, examples, tests,