From dc31e82d0058e7835acb13d0a57595150fdea08c Mon Sep 17 00:00:00 2001 From: Vladimir Golovnev Date: Tue, 17 Oct 2023 21:31:55 +0300 Subject: [PATCH] CI: Use dynamic MSVC run-time library 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. --- .github/workflows/ci_windows.yaml | 4 ++-- src/app/cmdoptions.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci_windows.yaml b/.github/workflows/ci_windows.yaml index f7e310f60..37900f7f5 100644 --- a/.github/workflows/ci_windows.yaml +++ b/.github/workflows/ci_windows.yaml @@ -101,7 +101,7 @@ jobs: -DBOOST_ROOT="${{ env.boost_path }}" ` -DBUILD_SHARED_LIBS=OFF ` -Ddeprecated-functions=OFF ` - -Dstatic_runtime=ON ` + -Dstatic_runtime=OFF ` -DVCPKG_TARGET_TRIPLET=x64-windows-static-release cmake --build build cmake --install build @@ -117,7 +117,7 @@ jobs: -DCMAKE_TOOLCHAIN_FILE="${{ env.RUNVCPKG_VCPKG_ROOT }}/scripts/buildsystems/vcpkg.cmake" ` -DBOOST_ROOT="${{ env.boost_path }}" ` -DLibtorrentRasterbar_DIR="${{ env.libtorrent_path }}/lib/cmake/LibtorrentRasterbar" ` - -DMSVC_RUNTIME_DYNAMIC=OFF ` + -DMSVC_RUNTIME_DYNAMIC=ON ` -DQT6=ON ` -DTESTING=ON ` -DVCPKG_TARGET_TRIPLET=x64-windows-static-release ` diff --git a/src/app/cmdoptions.cpp b/src/app/cmdoptions.cpp index 0b993c3a6..9b3dddbfa 100644 --- a/src/app/cmdoptions.cpp +++ b/src/app/cmdoptions.cpp @@ -373,7 +373,7 @@ QBtCommandLineParameters parseCommandLine(const QStringList &args) if ((arg.startsWith(u"--") && !arg.endsWith(u".torrent")) || (arg.startsWith(u'-') && (arg.size() == 2))) - { + { // Parse known parameters if (arg == SHOW_HELP_OPTION) {