1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: Fix INPUT_* names with dashes

Browse Source 
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>
This commit is contained in:
Joerg Bornemann 2020-10-21 11:49:15 +02:00
parent e7d1a5ace5
commit 9ff9a54bfb
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmake/QtProcessConfigureArgs.cmake
View File

@ -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)