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

CMake: Fix forwarding the '0' argument which is by default falsey

Browse Source 
If the forward argument was meant to be 0, it was not forwarded
because it evaluated to false in if(condition).

To pass it along, instead check for empty strings.

Pick-to: 6.8
Change-Id: Ia366df147de0c2d333017da43dc0643b56a89e9c
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
Alexandru Croitor 2024-06-05 18:21:00 +02:00
parent a05f5457ca
commit 96abceb64e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/QtPublicCMakeHelpers.cmake
View File

@ -641,13 +641,13 @@ function(_qt_internal_forward_function_args)
endforeach() endforeach()
foreach(option_name IN LISTS arg_FORWARD_SINGLE) foreach(option_name IN LISTS arg_FORWARD_SINGLE)
if(${arg_FORWARD_PREFIX}_${option_name}) if(NOT "${arg_FORWARD_PREFIX}_${option_name}" STREQUAL "")
list(APPEND forward_args "${option_name}" "${${arg_FORWARD_PREFIX}_${option_name}}") list(APPEND forward_args "${option_name}" "${${arg_FORWARD_PREFIX}_${option_name}}")
endif() endif()
endforeach() endforeach()
foreach(option_name IN LISTS arg_FORWARD_MULTI) foreach(option_name IN LISTS arg_FORWARD_MULTI)
if(${arg_FORWARD_PREFIX}_${option_name}) if(NOT "${arg_FORWARD_PREFIX}_${option_name}" STREQUAL "")
list(APPEND forward_args "${option_name}" ${${arg_FORWARD_PREFIX}_${option_name}}) list(APPEND forward_args "${option_name}" ${${arg_FORWARD_PREFIX}_${option_name}})
endif() endif()
endforeach() endforeach()