Add OS-specific prelude to qt-cmake-standalone-test

This makes sure the executable is run as a shell script with the proper interpreter on Unix systems. Otherwise it will fail in some shells, like fish. On windows, it prevents all commands in the batch file from displaying on the screen. Change-Id: If554262f172b035b9661b3e2ff26a96789fa707b Reviewed-by: Alexandru Croitor <[email protected]>
chain78 · Jul 15, 2020 · a99bc30 · a99bc30
1 parent 1245908
commit a99bc30
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/bin/qt-cmake-standalone-test.in b/bin/qt-cmake-standalone-test.in
@@ -1 +1,3 @@
+@__qt_cmake_standalone_test_os_prelude@
+
 @__qt_cmake_private_path@ @__qt_cmake_standalone_test_path@ -DQT_STANDALONE_TEST_PATH=@__qt_cmake_standalone_passed_args@
diff --git a/cmake/QtBaseGlobalTargets.cmake b/cmake/QtBaseGlobalTargets.cmake
@@ -239,9 +239,11 @@ if(QT_WILL_INSTALL)
                  "${__qt_cmake_standalone_test_path}")
 endif()
 if(UNIX)
+    set(__qt_cmake_standalone_test_os_prelude "#!/bin/sh")
     string(PREPEND __qt_cmake_private_path "exec ")
     set(__qt_cmake_standalone_passed_args "\"$@\" -DPWD=\"$PWD\"")
 else()
+    set(__qt_cmake_standalone_test_os_prelude "@echo off")
     string(APPEND __qt_cmake_standalone_test_bin_name ".bat")
     string(APPEND __qt_cmake_private_path ".bat")
     set(__qt_cmake_standalone_passed_args "%* -DPWD=\"%CD%\"")
Original file line number	Diff line number	Diff line change
		@@ -1 +1,3 @@
		@__qt_cmake_standalone_test_os_prelude@

		@__qt_cmake_private_path@ @__qt_cmake_standalone_test_path@ -DQT_STANDALONE_TEST_PATH=@__qt_cmake_standalone_passed_args@