diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-05-28 16:19:42 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-06-03 14:41:28 +0000 |
| commit | e88864578a881c0a14ef2dc958ee52e2aa036134 (patch) | |
| tree | 0ee2ade2756542a07de5068de4ebe345979fa0cf /util/cmake/helper.py | |
| parent | 46effc7319582fb10c5d3fc4737f6e1b2f9c3e8b (diff) | |
Generate the c++xx standard features instead of skipping them
The features are reused in qtdeclarative (and maybe somewhere else
too), so they should be present. We can still map the conditions
to proper CMake compile feature tests.
Change-Id: I4d307d29d4d293cc23ab005b195ea346087c7162
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'util/cmake/helper.py')
| -rw-r--r-- | util/cmake/helper.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/util/cmake/helper.py b/util/cmake/helper.py index bb2b239aa0..8f24a49d6b 100644 --- a/util/cmake/helper.py +++ b/util/cmake/helper.py @@ -302,7 +302,10 @@ def find_library_info_for_target(targetName: str) -> typing.Optional[LibraryMapp def featureName(input: str) -> str: - return re.sub(r'[^a-zA-Z0-9_]', '_', input) + replacement_char = '_' + if input.startswith('c++'): + replacement_char = 'x' + return re.sub(r'[^a-zA-Z0-9_]', replacement_char, input) def map_qt_library(lib: str) -> str: |