diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-10-19 13:35:15 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-11-20 20:38:03 +0100 |
| commit | fb21a5ce1a5831fab2af5e4d301600d6a6211e5d (patch) | |
| tree | b4fdb21ea8c58c352c26383505f958b1a6ac9967 /cmake/QtProcessConfigureArgs.cmake | |
| parent | 47778847ec103242ee95b01d502272d6a9879e9b (diff) | |
CMake: Name QT_NO_MAKE_*/BUILD_* variables consistently
For consistency, apply the following renamings:
QT_NO_MAKE_EXAMPLES -> QT_BUILD_EXAMPLES_BY_DEFAULT
QT_NO_MAKE_TESTS -> QT_BUILD_TESTS_BY_DEFAULT
QT_NO_MAKE_TOOLS -> QT_BUILD_TOOLS_BY_DEFAULT
BUILD_EXAMPLES -> QT_BUILD_EXAMPLES
BUILD_TESTING -> QT_BUILD_TESTS
This should help to better convey the difference between "BUILD" and
"NO_MAKE".
To configure tests, but not to build them by default, pass the
following to CMake:
-DQT_BUILD_TESTS=ON -DQT_BUILD_TESTS_BY_DEFAULT=OFF
Analoguous for examples:
-DQT_BUILD_EXAMPLES=ON -DQT_BUILD_EXAMPLES_BY_DEFAULT=OFF
Tools can be excluded from the default build with:
-DBUILD_TOOLS_BY_DEFAULT=OFF
The variable BUILD_TESTING is still available and initialized with the
value of QT_BUILD_TESTS.
Pick-to: 6.0 6.0.0
Change-Id: Ie5f29dfbdca8bfa8d687981dfe8c19c0397ca080
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'cmake/QtProcessConfigureArgs.cmake')
| -rw-r--r-- | cmake/QtProcessConfigureArgs.cmake | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cmake/QtProcessConfigureArgs.cmake b/cmake/QtProcessConfigureArgs.cmake index e8672306dd..258a4a09e1 100644 --- a/cmake/QtProcessConfigureArgs.cmake +++ b/cmake/QtProcessConfigureArgs.cmake @@ -664,11 +664,11 @@ drop_input(nomake) foreach(part ${INPUT_nomake}) if("${part}" STREQUAL "tests") - push("-DBUILD_TESTING=OFF") + push("-DQT_BUILD_TESTS=OFF") continue() endif() if("${part}" STREQUAL "examples") - push("-DBUILD_EXAMPLES=OFF") + push("-DQT_BUILD_EXAMPLES=OFF") continue() endif() qtConfAddWarning("'-nomake ${part}' is not implemented yet.") @@ -676,11 +676,11 @@ endforeach() foreach(part ${INPUT_make}) if("${part}" STREQUAL "tests") - push("-DBUILD_TESTING=ON") + push("-DQT_BUILD_TESTS=ON") continue() endif() if("${part}" STREQUAL "examples") - push("-DBUILD_EXAMPLES=ON") + push("-DQT_BUILD_EXAMPLES=ON") continue() endif() if("${part}" STREQUAL "tools") |