feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

CMake build: Fix additional feature info

Browse Source 
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>
This commit is contained in:
Eike Ziller
2019-09-18 15:47:42 +02:00
parent a8cad2038e
commit 8354d426de
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cmake/QtCreatorAPI.cmake
View File

@@ -691,10 +691,15 @@ function(extend_qtc_target target_name)
if (NOT _arg_CONDITION) if (NOT _arg_CONDITION)
set(_arg_CONDITION ON) set(_arg_CONDITION ON)
endif() endif()
if (_arg_FEATURE_INFO) if (${_arg_CONDITION})
add_feature_info(${_arg_FEATURE_INFO} _arg_CONDITION "${_extra_text}") set(_feature_enabled ON)
else()
set(_feature_enabled OFF)
endif() 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() return()
endif() endif()