diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-10-21 11:49:15 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-10-22 18:06:19 +0200 |
| commit | 9ff9a54bfbe77aa0f22da46ad55e1d39b2a49e22 (patch) | |
| tree | 1c1e9a2d06aedfc0065e3785134ed25eec55771e /cmake | |
| parent | e7d1a5ace517b4d691019723a91e97e4b998ff84 (diff) | |
CMake: Fix INPUT_* names with dashes
In configure.json files we have inputs with dashes, e.g.
bundlex-xcb-xinput. In configure.cmake files, these are read in their
normalized form, e.g. INPUT_bundled_xcb_xinput.
Normalize the input names in QtProcessConfigureArgs.cmake like we
already do for feature names.
Change-Id: Iece414d40a0e9e2920580f2fda68e25cd32674c9
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/QtProcessConfigureArgs.cmake | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cmake/QtProcessConfigureArgs.cmake b/cmake/QtProcessConfigureArgs.cmake index 704abfe1a8..b0b4e74dbf 100644 --- a/cmake/QtProcessConfigureArgs.cmake +++ b/cmake/QtProcessConfigureArgs.cmake @@ -688,7 +688,8 @@ foreach(feature ${commandline_known_features}) endforeach() foreach(input ${config_inputs}) - push("-DINPUT_${input}=${INPUT_${input}}") + qt_feature_normalize_name("${input}" cmake_input) + push("-DINPUT_${cmake_input}=${INPUT_${input}}") endforeach() if(NOT generator AND auto_detect_generator) |