diff options
| author | Kevin Funk <kevin.funk@kdab.com> | 2019-02-11 10:55:07 +0100 |
|---|---|---|
| committer | Kevin Funk <kevin.funk@kdab.com> | 2019-02-11 17:14:01 +0000 |
| commit | 2635ab01d28da1d2770c2090aa68ac7a01c070fd (patch) | |
| tree | c357ee47e43383a653e2131119c259ef5b85e054 /cmake | |
| parent | c5e2838b642d2a50d951efe7b582d9261d55dfb7 (diff) | |
cmake: QtFeature: Do not error out when using Qt
... outside of qtbase.git
Change-Id: I1895ef07c881766e2b28839d0422916b6916e10e
Reviewed-by: Jean-Michaël Celerier <jean-michael.celerier@kdab.com>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/QtFeature.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmake/QtFeature.cmake b/cmake/QtFeature.cmake index 3d0f277b0e..e57d541898 100644 --- a/cmake/QtFeature.cmake +++ b/cmake/QtFeature.cmake @@ -430,8 +430,8 @@ function(qt_make_features_available target) continue() endif() foreach(feature IN ITEMS ${features}) - if (DEFINED "QT_FEATURE_${feature}") - message(FATAL_ERROR "Feature ${feature} is already defined when importing features from ${target}.") + 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}.") endif() set(QT_FEATURE_${feature} "${value}" CACHE INTERNAL "Qt feature: ${feature} (from target ${target})") endforeach() |