From 8354d426de35a06e835ceaca63f768adf39d4d1b Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@qt.io>
Date: Wed, 18 Sep 2019 15:47:42 +0200
Subject: [PATCH] CMake build: Fix additional feature info

They were always printed as enabled, because the
condition is not evaluated within add_feature_info

Change-Id: I9e50648d037aebecdb895d4ce5f4de7c1fee3ead
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
---
 cmake/QtCreatorAPI.cmake | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/cmake/QtCreatorAPI.cmake b/cmake/QtCreatorAPI.cmake
index 4e7aca2d5ec..61b45cc5efe 100644
--- a/cmake/QtCreatorAPI.cmake
+++ b/cmake/QtCreatorAPI.cmake
@@ -691,10 +691,15 @@ function(extend_qtc_target target_name)
   if (NOT _arg_CONDITION)
     set(_arg_CONDITION ON)
   endif()
-  if (_arg_FEATURE_INFO)
-    add_feature_info(${_arg_FEATURE_INFO} _arg_CONDITION "${_extra_text}")
+  if (${_arg_CONDITION})
+    set(_feature_enabled ON)
+  else()
+    set(_feature_enabled OFF)
   endif()
-  if (NOT (${_arg_CONDITION}))
+  if (_arg_FEATURE_INFO)
+    add_feature_info(${_arg_FEATURE_INFO} _feature_enabled "${_extra_text}")
+  endif()
+  if (NOT _feature_enabled)
     return()
   endif()