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

CMake: Support mkspec-related configure arguments

Browse Source 
Task-number: QTBUG-85373
Change-Id: I44ae15b4c05f23442ac6b9d69d31f22f01d0a48c
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Joerg Bornemann 2020-07-06 09:21:41 +02:00
parent fe5fa1d974
commit 63e90281b2
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cmake/QtProcessConfigureArgs.cmake
View File

@ -32,6 +32,7 @@ list(TRANSFORM configure_args STRIP)
unset(generator) unset(generator)
set(auto_detect_generator TRUE) set(auto_detect_generator TRUE)
unset(build_configs) unset(build_configs)
unset(device_options)
while(configure_args) while(configure_args)
list(POP_FRONT configure_args arg) list(POP_FRONT configure_args arg)
if(arg STREQUAL "-cmake") if(arg STREQUAL "-cmake")
@ -121,6 +122,15 @@ while(configure_args)
elseif(arg MATCHES "^-(no-)?framework") elseif(arg MATCHES "^-(no-)?framework")
calculate_state() calculate_state()
push("-DFEATURE_framework=${state}") push("-DFEATURE_framework=${state}")
elseif(arg MATCHES "^-x?platform$")
list(POP_FRONT configure_args mkspec)
push("-DQT_QMAKE_TARGET_MKSPEC=${mkspec}")
elseif(arg STREQUAL "-device")
list(POP_FRONT configure_args mkspec)
push("-DQT_QMAKE_TARGET_MKSPEC=devices/${mkspec}")
elseif(arg STREQUAL "-device-option")
list(POP_FRONT configure_args opt)
list(APPEND device_options "${opt}")
elseif(arg STREQUAL "--") elseif(arg STREQUAL "--")
# Everything after this argument will be passed to CMake verbatim. # Everything after this argument will be passed to CMake verbatim.
push(${configure_args}) push(${configure_args})
@ -145,6 +155,12 @@ elseif(nr_of_build_configs GREATER 1)
list(APPEND cmake_args "-DCMAKE_CONFIGURATION_TYPES=${escaped_build_configs}") list(APPEND cmake_args "-DCMAKE_CONFIGURATION_TYPES=${escaped_build_configs}")
endif() endif()
if(device_options)
unset(escaped_device_options)
list(JOIN device_options "\\;" escaped_device_options)
list(APPEND cmake_args "-DQT_QMAKE_DEVICE_OPTIONS=${escaped_device_options}")
endif()
if(NOT generator AND auto_detect_generator) if(NOT generator AND auto_detect_generator)
find_program(ninja ninja) find_program(ninja ninja)
if(ninja) if(ninja)