diff options
| author | Peter Varga <pvarga@inf.u-szeged.hu> | 2021-09-22 16:41:06 +0200 |
|---|---|---|
| committer | Peter Varga <pvarga@inf.u-szeged.hu> | 2021-09-27 15:03:55 +0000 |
| commit | 31db7f6a192f0ffbbadfe49997df0d64a1ead6ae (patch) | |
| tree | c2d6ed0a4f0c79e605cc0a34e28a85710c22b7af | |
| parent | 70abc0b2eebc777309d372203df5ca1e785402d8 (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.
Pick-to: 6.2
Change-Id: I3898bcad2051276d44953ae72d87cf4f91516012
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
| -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 05f83ddf1..c66e65e71 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) |