diff options
| author | Peter Varga <pvarga@inf.u-szeged.hu> | 2021-09-22 16:41:06 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-09-27 20:08:28 +0000 |
| commit | a0b13e409155bb075e3faf5d45cfea460abde240 (patch) | |
| tree | f0150e7c2246961336234c70cea20a111671274c /cmake | |
| parent | e5b7db68e30251ee2044607d939f54bd5628a68c (diff) | |
Fix extract_cflag cmake function to not add extra semicolon
LIST(APPEND cflags ...) separates appended elements with a semicolon.
This may break parsing cflags and can result invalid args.gn. Remove
semicolons from cflags before parsing it.
Change-Id: I3898bcad2051276d44953ae72d87cf4f91516012
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
(cherry picked from commit 31db7f6a192f0ffbbadfe49997df0d64a1ead6ae)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/Functions.cmake | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/cmake/Functions.cmake b/cmake/Functions.cmake index a326924ef..fcb16a978 100644 --- a/cmake/Functions.cmake +++ b/cmake/Functions.cmake @@ -586,6 +586,7 @@ function(extract_cflag result cflag) math(EXPR i "${i} + 1") endwhile() list(APPEND cflags ${CMAKE_C_FLAGS} ${CMAKE_CXX_FLAGS}) + string(REPLACE ";" " " cflags "${cflags}") message(DEBUG "Found cflags: ${cflags}") if(cflags MATCHES "-${cflag}=([^ ]+)") set(${result} ${CMAKE_MATCH_1} PARENT_SCOPE) |