Commit: b320f3d17e6ddc9f7ec11d7fad595d273260504d - Fs-scripts (git)

Commit MetaInfo

• Revision: b320f3d17e6ddc9f7ec11d7fad595d273260504d (tree)
• Time: 2022-11-20 07:32:05
• Author: Fs <Fsu0413@vip....>
• Commiter: Fs

Log Message

怎么还是不对

Change Summary

• modified: qt6_deploy_host.sh
• modified: qt6_deploy_host.vbs

Incremental Difference

--- a/qt6_deploy_host.sh
+++ b/qt6_deploy_host.sh
@@ -82,3 +82,9 @@ c\
 set(__qt_platform_initial_qt_host_path_cmake_dir "${CMAKE_CURRENT_LIST_DIR}/../../../host/lib/cmake")
 d
 }' "${PATH_TO_TARGET}/lib/cmake/Qt6/qt.toolchain.cmake"
+
+sed -i '' -e '/^set(__qt_toolchain_initial_qt_host_path_cmake_dir[[:space:]]*$/{N
+c\
+set(__qt_toolchain_initial_qt_host_path_cmake_dir "${CMAKE_CURRENT_LIST_DIR}/../../../host/lib/cmake")
+d
+}' "${PATH_TO_TARGET}/lib/cmake/Qt6/qt.toolchain.cmake"

--- a/qt6_deploy_host.vbs
+++ b/qt6_deploy_host.vbs
@@ -107,12 +107,17 @@ Set qt_toolchain_cmakeold = fso.OpenTextFile(PATH_TO_TARGET & "\lib\cmake\Qt6\qt
 
 Do until qt_toolchain_cmakeold.AtEndOfStream 
 	line = qt_toolchain_cmakeold.ReadLine
-	If Left(Trim(line), 48) = "set(__qt_platform_initial_qt_host_path_cmake_dir" Then
+	
+	' Qt 6.2.4 intentionally put the path to next line. It should be skipped.
+	If Left(Trim(line), 49) = "set(__qt_toolchain_initial_qt_host_path_cmake_dir" Then
+		line = "set(__qt_toolchain_initial_qt_host_path_cmake_dir ""${CMAKE_CURRENT_LIST_DIR}/../../../host/lib/cmake"")"
+		qt_toolchain_cmakeold.ReadLine
+	ElseIf Left(Trim(line), 48) = "set(__qt_platform_initial_qt_host_path_cmake_dir" Then
 		line = "set(__qt_platform_initial_qt_host_path_cmake_dir ""${CMAKE_CURRENT_LIST_DIR}/../../../host/lib/cmake"")"
 		qt_toolchain_cmakeold.ReadLine
 	ElseIf Left(Trim(line), 38) = "set(__qt_platform_initial_qt_host_path" Then
 		line = "set(__qt_platform_initial_qt_host_path ""${CMAKE_CURRENT_LIST_DIR}/../../../host"")"
-		qt_toolchain_cmakeold.ReadLine ' Qt 6.2.4 intentionally put the path to next line. It should be skipped.
+		qt_toolchain_cmakeold.ReadLine
 	End If
 	qt_toolchain_cmake.WriteLine line
 Loop