github/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent synced 2025-08-19 21:03:30 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

CI: Use dynamic MSVC run-time library

Browse source 
Otherwise, there is a conflict of run-time libraries used (since Qt DLLs are still use dynamic MSVCRT) that leads to strange errors.

PR #19718.
Closes #19701.
This commit is contained in:
Vladimir Golovnev 2023-10-17 21:31:55 +03:00 • committed by Vladimir Golovnev (Glassez)
commit dc31e82d00
No known key found for this signature in database
GPG key ID: 52A2C7DEE2DFA6F7
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/ci_windows.yaml vendored
View file

@ -101,7 +101,7 @@ jobs:
-DBOOST_ROOT="${{ env.boost_path }}" ` -DBOOST_ROOT="${{ env.boost_path }}" `
-DBUILD_SHARED_LIBS=OFF ` -DBUILD_SHARED_LIBS=OFF `
-Ddeprecated-functions=OFF ` -Ddeprecated-functions=OFF `
-Dstatic_runtime=ON ` -Dstatic_runtime=OFF `
-DVCPKG_TARGET_TRIPLET=x64-windows-static-release -DVCPKG_TARGET_TRIPLET=x64-windows-static-release
cmake --build build cmake --build build
cmake --install build cmake --install build
@ -117,7 +117,7 @@ jobs:
-DCMAKE_TOOLCHAIN_FILE="${{ env.RUNVCPKG_VCPKG_ROOT }}/scripts/buildsystems/vcpkg.cmake" ` -DCMAKE_TOOLCHAIN_FILE="${{ env.RUNVCPKG_VCPKG_ROOT }}/scripts/buildsystems/vcpkg.cmake" `
-DBOOST_ROOT="${{ env.boost_path }}" ` -DBOOST_ROOT="${{ env.boost_path }}" `
-DLibtorrentRasterbar_DIR="${{ env.libtorrent_path }}/lib/cmake/LibtorrentRasterbar" ` -DLibtorrentRasterbar_DIR="${{ env.libtorrent_path }}/lib/cmake/LibtorrentRasterbar" `
-DMSVC_RUNTIME_DYNAMIC=OFF ` -DMSVC_RUNTIME_DYNAMIC=ON `
-DQT6=ON ` -DQT6=ON `
-DTESTING=ON ` -DTESTING=ON `
-DVCPKG_TARGET_TRIPLET=x64-windows-static-release ` -DVCPKG_TARGET_TRIPLET=x64-windows-static-release `

2
src/app/cmdoptions.cpp
View file

@ -373,7 +373,7 @@ QBtCommandLineParameters parseCommandLine(const QStringList &args)
if ((arg.startsWith(u"--") && !arg.endsWith(u".torrent")) if ((arg.startsWith(u"--") && !arg.endsWith(u".torrent"))
|| (arg.startsWith(u'-') && (arg.size() == 2))) || (arg.startsWith(u'-') && (arg.size() == 2)))
{ {
// Parse known parameters // Parse known parameters
if (arg == SHOW_HELP_OPTION) if (arg == SHOW_HELP_OPTION)
{ {