CMake: Fix line endings of wrapper scripts

If QT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS is ON then we generate
Windows scripts on Unix and vice versa.  We always used the host
platforms line endings for generating the scripts.  This leads to
Windows line endings in Unix scripts and vice versa.

Explicitly specify the line endings style when generating wrapper
scripts.

Fixes: QTBUG-102747
Pick-to: 6.2 6.3
Change-Id: I1603add46f276a5d91bbf0f103a261cdd84c343b
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>

2 files changed, 23 insertions, 11 deletions

diff --git a/cmake/QtQmakeHelpers.cmake b/cmake/QtQmakeHelpers.cmake
index 20b2504375..1ad05d7a80 100644
--- a/cmake/QtQmakeHelpers.cmake
+++ b/cmake/QtQmakeHelpers.cmake
@@ -156,16 +156,18 @@ HostSpec=${QT_QMAKE_HOST_MKSPEC}
     foreach(host_type ${hosts})
         foreach(tool_name qmake qtpaths)
             set(wrapper_extension)
+            set(newline_style LF)
 
             if(host_type STREQUAL "non-unix")
                 set(wrapper_extension ".bat")
+                set(newline_style CRLF)
             endif()
 
             set(wrapper_in_file
                 "${CMAKE_CURRENT_SOURCE_DIR}/bin/qmake-and-qtpaths-wrapper${wrapper_extension}.in")
 
             set(wrapper "preliminary/${wrapper_prefix}${tool_name}${wrapper_extension}")
-            configure_file("${wrapper_in_file}" "${wrapper}" @ONLY)
+            configure_file("${wrapper_in_file}" "${wrapper}" @ONLY NEWLINE_STYLE ${newline_style})
             qt_copy_or_install(PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/${wrapper}"
                 DESTINATION "${INSTALL_BINDIR}")
         endforeach()
diff --git a/cmake/QtWrapperScriptHelpers.cmake b/cmake/QtWrapperScriptHelpers.cmake
index 0b9b5cfa23..1480ea3176 100644
--- a/cmake/QtWrapperScriptHelpers.cmake
+++ b/cmake/QtWrapperScriptHelpers.cmake
@@ -18,13 +18,15 @@ function(qt_internal_create_wrapper_scripts)
 
     if(generate_unix)
         configure_file("${CMAKE_CURRENT_SOURCE_DIR}/bin/qt-cmake.in"
-                       "${QT_BUILD_DIR}/${INSTALL_BINDIR}/qt-cmake" @ONLY)
+                       "${QT_BUILD_DIR}/${INSTALL_BINDIR}/qt-cmake" @ONLY
+                        NEWLINE_STYLE LF)
         qt_install(PROGRAMS "${QT_BUILD_DIR}/${INSTALL_BINDIR}/qt-cmake"
                    DESTINATION "${INSTALL_BINDIR}")
     endif()
     if(generate_non_unix)
         configure_file("${CMAKE_CURRENT_SOURCE_DIR}/bin/qt-cmake.bat.in"
-                       "${QT_BUILD_DIR}/${INSTALL_BINDIR}/qt-cmake.bat" @ONLY)
+                       "${QT_BUILD_DIR}/${INSTALL_BINDIR}/qt-cmake.bat" @ONLY
+                       NEWLINE_STYLE CRLF)
         qt_install(PROGRAMS "${QT_BUILD_DIR}/${INSTALL_BINDIR}/qt-cmake.bat"
                    DESTINATION "${INSTALL_BINDIR}")
     endif()
@@ -40,13 +42,15 @@ function(qt_internal_create_wrapper_scripts)
     set(__qt_cmake_extra "-G\"${CMAKE_GENERATOR}\"")
     if(generate_unix)
         configure_file("${CMAKE_CURRENT_SOURCE_DIR}/bin/qt-cmake.in"
-            "${QT_BUILD_DIR}/${INSTALL_BINDIR}/qt-cmake-private" @ONLY)
+            "${QT_BUILD_DIR}/${INSTALL_BINDIR}/qt-cmake-private" @ONLY
+            NEWLINE_STYLE LF)
         qt_install(PROGRAMS "${QT_BUILD_DIR}/${INSTALL_BINDIR}/qt-cmake-private"
                DESTINATION "${INSTALL_BINDIR}")
     endif()
     if(generate_non_unix)
         configure_file("${CMAKE_CURRENT_SOURCE_DIR}/bin/qt-cmake.bat.in"
-            "${QT_BUILD_DIR}/${INSTALL_BINDIR}/qt-cmake-private.bat" @ONLY)
+            "${QT_BUILD_DIR}/${INSTALL_BINDIR}/qt-cmake-private.bat" @ONLY
+            NEWLINE_STYLE CRLF)
         qt_install(PROGRAMS "${QT_BUILD_DIR}/${INSTALL_BINDIR}/qt-cmake-private.bat"
                DESTINATION "${INSTALL_BINDIR}")
     endif()
@@ -64,13 +68,15 @@ function(qt_internal_create_wrapper_scripts)
         __relative_path_to_cmake_scripts_dir)
     if(generate_unix)
         configure_file("${CMAKE_CURRENT_SOURCE_DIR}/bin/qt-configure-module.in"
-            "${QT_BUILD_DIR}/${INSTALL_BINDIR}/qt-configure-module" @ONLY)
+            "${QT_BUILD_DIR}/${INSTALL_BINDIR}/qt-configure-module" @ONLY
+            NEWLINE_STYLE LF)
         qt_install(PROGRAMS "${QT_BUILD_DIR}/${INSTALL_BINDIR}/qt-configure-module"
             DESTINATION "${INSTALL_BINDIR}")
     endif()
     if(generate_non_unix)
         configure_file("${CMAKE_CURRENT_SOURCE_DIR}/bin/qt-configure-module.bat.in"
-            "${QT_BUILD_DIR}/${INSTALL_BINDIR}/qt-configure-module.bat" @ONLY)
+            "${QT_BUILD_DIR}/${INSTALL_BINDIR}/qt-configure-module.bat" @ONLY
+            NEWLINE_STYLE CRLF)
         qt_install(PROGRAMS "${QT_BUILD_DIR}/${INSTALL_BINDIR}/qt-configure-module.bat"
             DESTINATION "${INSTALL_BINDIR}")
     endif()
@@ -113,7 +119,8 @@ function(qt_internal_create_wrapper_scripts)
         set(__qt_cmake_standalone_passed_args "\"$@\" -DPWD=\"$PWD\"")
 
         configure_file("${CMAKE_CURRENT_SOURCE_DIR}/bin/qt-cmake-standalone-test.in"
-                       "${QT_BUILD_DIR}/${__qt_cmake_standalone_test_bin_path}")
+            "${QT_BUILD_DIR}/${__qt_cmake_standalone_test_bin_path}"
+            NEWLINE_STYLE LF)
         qt_install(PROGRAMS "${QT_BUILD_DIR}/${__qt_cmake_standalone_test_bin_path}"
                    DESTINATION "${INSTALL_BINDIR}")
     endif()
@@ -127,7 +134,8 @@ function(qt_internal_create_wrapper_scripts)
         set(__qt_cmake_standalone_passed_args "%* -DPWD=\"%CD%\"")
 
         configure_file("${CMAKE_CURRENT_SOURCE_DIR}/bin/qt-cmake-standalone-test.in"
-                       "${QT_BUILD_DIR}/${__qt_cmake_standalone_test_bin_path}")
+            "${QT_BUILD_DIR}/${__qt_cmake_standalone_test_bin_path}"
+            NEWLINE_STYLE CRLF)
         qt_install(PROGRAMS "${QT_BUILD_DIR}/${__qt_cmake_standalone_test_bin_path}"
                    DESTINATION "${INSTALL_BINDIR}")
     endif()
@@ -179,14 +187,16 @@ function(qt_internal_create_qt_configure_tests_wrapper_script)
 
     if(generate_unix)
         configure_file("${CMAKE_CURRENT_SOURCE_DIR}/libexec/${script_name}.in"
-            "${QT_BUILD_DIR}/${INSTALL_LIBEXECDIR}/${script_name}" @ONLY)
+            "${QT_BUILD_DIR}/${INSTALL_LIBEXECDIR}/${script_name}" @ONLY
+            NEWLINE_STYLE LF)
 
         qt_install(PROGRAMS "${QT_BUILD_DIR}/${INSTALL_LIBEXECDIR}/${script_name}"
                    DESTINATION "${INSTALL_LIBEXECDIR}")
     endif()
     if(generate_non_unix)
         configure_file("${CMAKE_CURRENT_SOURCE_DIR}/libexec/${script_name}.bat.in"
-            "${QT_BUILD_DIR}/${INSTALL_LIBEXECDIR}/${script_name}.bat" @ONLY)
+            "${QT_BUILD_DIR}/${INSTALL_LIBEXECDIR}/${script_name}.bat" @ONLY
+            NEWLINE_STYLE CRLF)
 
         qt_install(PROGRAMS "${QT_BUILD_DIR}/${INSTALL_LIBEXECDIR}/${script_name}.bat"
                    DESTINATION "${INSTALL_LIBEXECDIR}")