diff options
| author | Andreas Buhr <andreas.buhr@qt.io> | 2021-02-09 14:25:40 +0100 |
|---|---|---|
| committer | Andreas Buhr <andreas.buhr@qt.io> | 2021-02-10 10:39:10 +0100 |
| commit | 20633d97abed0f6025572f87c9359272b4713384 (patch) | |
| tree | 6e8bd29674103e08882e1f31c600e34c70331265 /cmake | |
| parent | 9828559a3dd7bf07e603e0ff5bee4520dbfd93d9 (diff) | |
More helpful error message when merging qt features in CMake
When a feature is set in qtbase and is later set to another value,
an error occurs and an error message is given. This patch
changes the error message to contain both the preexisting and the
new value
Change-Id: Ifa9fc1f06bfde40e8fd5dfdf30165d4393abbd28
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/QtFeature.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmake/QtFeature.cmake b/cmake/QtFeature.cmake index f38d464221..6e8a653c19 100644 --- a/cmake/QtFeature.cmake +++ b/cmake/QtFeature.cmake @@ -1014,7 +1014,7 @@ function(qt_make_features_available target) endif() foreach(feature IN ITEMS ${features}) if (DEFINED "QT_FEATURE_${feature}" AND NOT "${QT_FEATURE_${feature}}" STREQUAL "${value}") - message(FATAL_ERROR "Feature ${feature} is already defined and has a different value when importing features from ${target}.") + message(FATAL_ERROR "Feature ${feature} is already defined to be \"${QT_FEATURE_${feature}}\" and should now be set to \"${value}\" when importing features from ${target}.") endif() set(QT_FEATURE_${feature} "${value}" CACHE INTERNAL "Qt feature: ${feature} (from target ${target})") endforeach() |