From 73f9c514dc01e26735b7162756ee6344ea9ac025 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Tue, 13 Oct 2020 11:56:49 +0200 Subject: CMake: Ignore license-related configure arguments Do not print warnings for the configure arguments -commercial, -opensource and -confirm-license. We're not removing the arguments yet to keep existing build scripts working. Fixes: QTBUG-86096 Change-Id: Ieb63e2f2b81c022e8559cde6c3e0be0b8ce655ca Reviewed-by: Alexandru Croitor --- cmake/QtProcessConfigureArgs.cmake | 2 ++ cmake/configure-cmake-mapping.md | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'cmake') diff --git a/cmake/QtProcessConfigureArgs.cmake b/cmake/QtProcessConfigureArgs.cmake index a54edb3212..704abfe1a8 100644 --- a/cmake/QtProcessConfigureArgs.cmake +++ b/cmake/QtProcessConfigureArgs.cmake @@ -550,6 +550,8 @@ macro(translate_list_input name cmake_var) endif() endmacro() +drop_input(commercial) +drop_input(confirm-license) translate_boolean_input(precompile_header BUILD_WITH_PCH) translate_boolean_input(ccache QT_USE_CCACHE) translate_boolean_input(shared BUILD_SHARED_LIBS) diff --git a/cmake/configure-cmake-mapping.md b/cmake/configure-cmake-mapping.md index 1b81743e33..a1f5006d4d 100644 --- a/cmake/configure-cmake-mapping.md +++ b/cmake/configure-cmake-mapping.md @@ -20,9 +20,9 @@ The effort of this is tracked in QTBUG-85373 and QTBUG-85349. | -list-features | | At the moment: configure with cmake once, | | | | then use ccmake or cmake-gui to inspect the features. | | -list-libraries | | | -| -opensource | | | -| -commercial | | | -| -confirm-license | | | +| -opensource | n/a | | +| -commercial | n/a | | +| -confirm-license | n/a | | | -release | -DCMAKE_BUILD_TYPE=Release | | | -debug | -DCMAKE_BUILD_TYPE=Debug | | | -debug-and-release | -G "Ninja Multi-Config" | | -- cgit v1.2.3