From 2635ab01d28da1d2770c2090aa68ac7a01c070fd Mon Sep 17 00:00:00 2001 From: Kevin Funk Date: Mon, 11 Feb 2019 10:55:07 +0100 Subject: [PATCH] cmake: QtFeature: Do not error out when using Qt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ... outside of qtbase.git Change-Id: I1895ef07c881766e2b28839d0422916b6916e10e Reviewed-by: Jean-Michaël Celerier Reviewed-by: Tobias Hunger --- cmake/QtFeature.cmake | 4 ++-- 1 file 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()