From 84485dfad301af433da6a8377afbafcf228b43d2 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Thu, 1 Oct 2020 14:48:37 +0200 Subject: [PATCH] CMake: Fix -[no-]warnings-are-errors configure argument The CMake build uses the WARNINGS_ARE_ERRORS variable, and the feature warnings_are_errors exists only in the qmake build. Change-Id: I1e548b30b210b3dd1b2f23041d490a981312f4ba Reviewed-by: Cristian Adam --- cmake/QtProcessConfigureArgs.cmake | 1 + cmake/configure-cmake-mapping.md | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/QtProcessConfigureArgs.cmake b/cmake/QtProcessConfigureArgs.cmake index 794f675666f..b3b35ee5e4e 100644 --- a/cmake/QtProcessConfigureArgs.cmake +++ b/cmake/QtProcessConfigureArgs.cmake @@ -541,6 +541,7 @@ endmacro() translate_boolean_input(precompile_header BUILD_WITH_PCH) translate_boolean_input(ccache QT_USE_CCACHE) translate_boolean_input(shared BUILD_SHARED_LIBS) +translate_boolean_input(warnings_are_errors WARNINGS_ARE_ERRORS) translate_string_input(qt_namespace QT_NAMESPACE) translate_string_input(qt_libinfix QT_LIBINFIX) translate_string_input(qreal QT_COORD_TYPE) diff --git a/cmake/configure-cmake-mapping.md b/cmake/configure-cmake-mapping.md index ab29ef67ea1..b0fa969a750 100644 --- a/cmake/configure-cmake-mapping.md +++ b/cmake/configure-cmake-mapping.md @@ -76,8 +76,7 @@ The effort of this is tracked in QTBUG-85373 and QTBUG-85349. | -ccache | -DQT_USE_CCACHE=ON | | | -make-tool | n/a | | | -mp | n/a | | -| -warnings-are-errors | -DWARNINGS_ARE_ERRORS=ON or | | -| | -DFEATURE_warnings_are_errors=ON | | +| -warnings-are-errors | -DWARNINGS_ARE_ERRORS=ON | | | -silent | n/a | | | -sysroot | -DCMAKE_SYSROOT= | Should be provided by a toolchain file that's | | | | passed via -DCMAKE_TOOLCHAIN_FILE= |