From ba9d630c3de6a47d96e41b5a4b10ce2d5861e1fb Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Tue, 27 Nov 2018 10:00:10 +0100 Subject: 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 --- tools/qmlcachegen/qmlcachegen.pro | 1 + 1 file changed, 1 insertion(+) (limited to 'tools') 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 -- cgit v1.2.3