diff options
| author | Peter Varga <pvarga@inf.u-szeged.hu> | 2021-08-06 09:48:12 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-08-06 23:35:58 +0000 |
| commit | 261db2cd9298ae8925f7f59c99f54dea7c3610b7 (patch) | |
| tree | 28e9e1d9f860a4ff79606f663eddf530675fca46 | |
| parent | 7e2885017dcaeeaf5db6ca4f9775b95c76aee5ba (diff) | |
Fix wrong CHROMIUM_VERSION with cmake
Fixes: QTBUG-95614
Change-Id: I78b011400c10c28c5de15ea12f684b7e1766af37
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
(cherry picked from commit e87e25b32f98420fa527276ea6a73d1a76e4e64c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/core/configure/BUILD.root.gn.in | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/core/configure/BUILD.root.gn.in b/src/core/configure/BUILD.root.gn.in index b0118968c..2e00c50b5 100644 --- a/src/core/configure/BUILD.root.gn.in +++ b/src/core/configure/BUILD.root.gn.in @@ -12,8 +12,11 @@ import("//chrome/chrome_repack_locales.gni") import("//extensions/buildflags/buildflags.gni") import("//ui/ozone/ozone.gni") +# Workaround for cmake configure_file command. Words wrapped with @ characters are +# handled as variables in this file. +chromium_version_template = string_replace("atMAJORat.atMINORat.atBUILDat.atPATCHat", "at", "@") chromium_version = exec_script("//build/util/version.py", - [ "-f", rebase_path("//chrome/VERSION"), "-t", "@MAJOR@.@MINOR@.@BUILD@.@PATCH@"],"list lines") + [ "-f", rebase_path("//chrome/VERSION"), "-t", chromium_version_template], "list lines") moc_source_h_files = exec_script("@WEBENGINE_ROOT_SOURCE_DIR@/tools/scripts/gn_find_mocables.py", [ |