From a543e8f42e597a92a56116d0c505ec0880d74e3a Mon Sep 17 00:00:00 2001 From: Juha Vuolle Date: Tue, 26 Jan 2021 21:34:36 +0200 Subject: [PATCH] Fix QT_TOOL_PATH_SETUP_COMMAND Commit 18fc9e1bf821130f0cfe45dc7d5c05b70458e7c0 introduced a Windows-only QT_TOOL_PATH_SETUP_COMMAND to make it possible to call the tool of a module while building the module itself. The "set PATH=..." command in QT_TOOL_PATH_SETUP_COMMAND was flawed, because it contained escaped double quotes which made the set command ineffective. Fix this by removing the escaping of the double quotes. This was uncovered when porting qtscxml to CMake. Change-Id: I5909aa841e7895d6d0feb4037a935b805ccfdc99 Reviewed-by: Joerg Bornemann --- cmake/QtBuild.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake index 02d37ca03e..d9b8685fa5 100644 --- a/cmake/QtBuild.cmake +++ b/cmake/QtBuild.cmake @@ -258,7 +258,7 @@ function(qt_setup_tool_path_command) set(bindir "${QT_BUILD_INTERNALS_RELOCATABLE_INSTALL_PREFIX}/${INSTALL_BINDIR}") file(TO_NATIVE_PATH "${bindir}" bindir) list(APPEND command COMMAND) - list(APPEND command set \"PATH=${bindir}$%PATH%\") + list(APPEND command set PATH=${bindir}$%PATH%) set(QT_TOOL_PATH_SETUP_COMMAND "${command}" CACHE INTERNAL "internal command prefix for tool invocations" FORCE) endfunction() qt_setup_tool_path_command()