diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2018-11-27 10:00:10 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2018-11-27 12:50:00 +0000 |
| commit | ba9d630c3de6a47d96e41b5a4b10ce2d5861e1fb (patch) | |
| tree | 269697dba156827666c9a376864e8427f141e5ef | |
| parent | 5246b910771e0dd824b4eea7c5245e5f9f3a63f0 (diff) | |
Fix Qt Quick Compiler with CMake on Windows
We perform a qmake substitution pass on QtQuickCompilerCompiler.cmake.in,
which contains code to determine the location of the qmlcachegen tool.
The expression
set(compiler_path \"$${CMAKE_BIN_DIR}qmlcachegen$$CMAKE_BIN_SUFFIX\")
requires that $$CMAKE_BIN_SUFFIX is set correctly, so that it expands to
.exe on Windows and we can locate the binary correctly. This is
identical to what's done in create_cmake.prf.
[ChangeLog][Qml] Fix Qt Quick Compiler with CMake on Windows
Task-number: QTBUG-71829
Change-Id: I81a7452b7dc7f01c9114900b9c103122fec07cf6
Reviewed-by: Kevin Funk <kevin.funk@kdab.com>
| -rw-r--r-- | tools/qmlcachegen/qmlcachegen.pro | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/qmlcachegen/qmlcachegen.pro b/tools/qmlcachegen/qmlcachegen.pro index 9662690395..bee0b9a37e 100644 --- a/tools/qmlcachegen/qmlcachegen.pro +++ b/tools/qmlcachegen/qmlcachegen.pro @@ -24,6 +24,7 @@ contains(CMAKE_BIN_DIR, "^\\.\\./.*") { load(qt_build_paths) +equals(QMAKE_HOST.os, Windows): CMAKE_BIN_SUFFIX = ".exe" cmake_config_file.input = $$PWD/Qt5QuickCompilerConfig.cmake.in cmake_config_file.output = $$MODULE_BASE_OUTDIR/lib/cmake/Qt5QuickCompiler/Qt5QuickCompilerConfig.cmake QMAKE_SUBSTITUTES += cmake_config_file |