diff options
| author | Kirill Burtsev <kirill.burtsev@qt.io> | 2021-09-08 14:28:57 +0200 |
|---|---|---|
| committer | Kirill Burtsev <kirill.burtsev@qt.io> | 2021-09-09 13:39:44 +0200 |
| commit | 48da2963211070f8568407c4f79fece7bdfd88ea (patch) | |
| tree | 3658ecfcb06c72fbf7a02139aad9e29e9577a4cd /cmake | |
| parent | 518d4f10dadf0dcf812a6b949c8febdb0bb93a58 (diff) | |
| download | qtwebengine-48da2963211070f8568407c4f79fece7bdfd88ea.tar.gz | |
Fix runGn of qtpdf target for developer build with clang
Resolves an error on gn_config_cxx.cmake include:
CMake Error at src/pdf/RelWithDebInfo/x86_64/gn_config_cxx.cmake:4:
Parse error. Function missing ending ")". End of file reached.
Lists for config vars may contain values, like -Wno-error=#warning
for GN_CXX_COMPILE_OPTIONS, which cause parsing errors and should be quoted.
Pick-to: 6.2 6.2.0
Change-Id: I983f5b23c9013d55f728ffe4354f6abbb0db1911
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/Functions.cmake | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cmake/Functions.cmake b/cmake/Functions.cmake index 02c2dae9c..4bdcda8ee 100644 --- a/cmake/Functions.cmake +++ b/cmake/Functions.cmake @@ -79,11 +79,11 @@ function(create_cxx_config cmakeTarget arch configFileName) file(GENERATE OUTPUT $<CONFIG>/${arch}/${configFileName} CONTENT "\ - set(GN_INCLUDES $<TARGET_PROPERTY:INCLUDE_DIRECTORIES>)\n\ - set(GN_DEFINES $<TARGET_PROPERTY:COMPILE_DEFINITIONS>)\n\ - set(GN_LINK_OPTIONS $<TARGET_PROPERTY:LINK_OPTIONS>)\n\ - set(GN_CXX_COMPILE_OPTIONS $<TARGET_PROPERTY:COMPILE_OPTIONS>)\n\ - set(GN_MOC_PATH $<TARGET_FILE:Qt::moc>)" + set(GN_INCLUDES \"$<TARGET_PROPERTY:INCLUDE_DIRECTORIES>\")\n\ + set(GN_DEFINES \"$<TARGET_PROPERTY:COMPILE_DEFINITIONS>\")\n\ + set(GN_LINK_OPTIONS \"$<TARGET_PROPERTY:LINK_OPTIONS>\")\n\ + set(GN_CXX_COMPILE_OPTIONS \"$<TARGET_PROPERTY:COMPILE_OPTIONS>\")\n\ + set(GN_MOC_PATH \"$<TARGET_FILE:Qt::moc>\")" # set(GN_LIBS $<TARGET_PROPERTY:LINK_LIBRARIES>) CONDITION $<COMPILE_LANGUAGE:CXX> TARGET ${cmakeTarget} |