diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-09-18 15:47:42 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-09-20 06:07:13 +0000 |
| commit | 8354d426de35a06e835ceaca63f768adf39d4d1b (patch) | |
| tree | 28661465a93d3a39a776d02be83144ba467b6084 | |
| parent | a8cad2038e9609382493eb6b6adcb5f5720e9bcc (diff) | |
| download | qt-creator-8354d426de35a06e835ceaca63f768adf39d4d1b.tar.gz | |
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>
| -rw-r--r-- | cmake/QtCreatorAPI.cmake | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/cmake/QtCreatorAPI.cmake b/cmake/QtCreatorAPI.cmake index 4e7aca2d5e..61b45cc5ef 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_CONDITION}) + set(_feature_enabled ON) + else() + set(_feature_enabled OFF) + endif() if (_arg_FEATURE_INFO) - add_feature_info(${_arg_FEATURE_INFO} _arg_CONDITION "${_extra_text}") + add_feature_info(${_arg_FEATURE_INFO} _feature_enabled "${_extra_text}") endif() - if (NOT (${_arg_CONDITION})) + if (NOT _feature_enabled) return() endif() |