1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: Fix errors about missing qt_setup_tool_path_command.bat.in

Browse Source 
This amends commit 0bea727cac6b22af05e0ae68b02de6684c98667b or rather
reverts it and applies a different fix for QTBUG-98843.

Use file(WRITE) instead of configure_file or file(CONFIGURE).  This
command doesn't have the line endings issues in CMake 3.19 (see
QTBUG-98843).  It's not problematic that the .bat file gets a new
timestamp on every configuration step, since we don't add dependencies
on it.

Fixes: QTBUG-99223
Task-number: QTBUG-98843
Change-Id: Ibdcd0e4703bf6df42c6a6d0bb2f35c5144bbe30a
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
This commit is contained in:
Joerg Bornemann 2021-12-15 11:19:57 +01:00
parent 12511c9941
commit 2a013fec1c
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmake/QtBuild.cmake
View File

@ -273,9 +273,9 @@ function(qt_internal_generate_tool_command_wrapper)
set(bindir "${QT_BUILD_INTERNALS_RELOCATABLE_INSTALL_PREFIX}/${INSTALL_BINDIR}") set(bindir "${QT_BUILD_INTERNALS_RELOCATABLE_INSTALL_PREFIX}/${INSTALL_BINDIR}")
file(TO_NATIVE_PATH "${bindir}" bindir) file(TO_NATIVE_PATH "${bindir}" bindir)
set(tool_command_wrapper_path "${QT_BUILD_DIR}/${INSTALL_LIBEXECDIR}/qt_setup_tool_path.bat") set(tool_command_wrapper_path "${QT_BUILD_DIR}/${INSTALL_LIBEXECDIR}/qt_setup_tool_path.bat")
configure_file("${QT_CMAKE_DIR}/qt_setup_tool_path.bat.in" file(WRITE "${tool_command_wrapper_path}" "@echo off
"${tool_command_wrapper_path}" @ONLY set PATH=${bindir};%PATH%
NEWLINE_STYLE WIN32) %*")
set(QT_TOOL_COMMAND_WRAPPER_PATH "${tool_command_wrapper_path}" set(QT_TOOL_COMMAND_WRAPPER_PATH "${tool_command_wrapper_path}"
CACHE INTERNAL "Path to the wrapper of the tool commands") CACHE INTERNAL "Path to the wrapper of the tool commands")
set_property(GLOBAL PROPERTY _qt_internal_generate_tool_command_wrapper_called TRUE) set_property(GLOBAL PROPERTY _qt_internal_generate_tool_command_wrapper_called TRUE)

3
cmake/qt_setup_tool_path.bat.in
View File

@ -1,3 +0,0 @@
@echo off
set PATH=@bindir@;%PATH%
%*