From fb21a5ce1a5831fab2af5e4d301600d6a6211e5d Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Mon, 19 Oct 2020 13:35:15 +0200 Subject: 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 --- cmake/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cmake/README.md') diff --git a/cmake/README.md b/cmake/README.md index 8a3ba27c3c..eaaa781380 100644 --- a/cmake/README.md +++ b/cmake/README.md @@ -128,7 +128,7 @@ machine you're building on, regardless of the architecure you are targeting. Build Qt regularly for your host system and install it into a directory of your choice using the ``CMAKE_INSTALL_PREFIX`` variable. You are free to disable the build of tests and examples by -passing ``-DBUILD_EXAMPLES=OFF`` and ``-DBUILD_TESTING=OFF``. +passing ``-DQT_BUILD_EXAMPLES=OFF`` and ``-DQT_BUILD_TESTS=OFF``. With this installation of Qt in place, which contains all tools needed, we can proceed to create a new build of Qt that is cross-compiled to the target architecture of choice. You may proceed by -- cgit v1.2.3