From ebf9a60c6994ec08455f43308a50460066faf5bb Mon Sep 17 00:00:00 2001 From: jagannatharjun Date: Sun, 27 Sep 2020 00:02:56 +0530 Subject: [PATCH] By default use dynamic runtime with MSVC on CMake This was default before CMake overhaul, and it doesn't make sense to use static builds with daily developement. Also static Qt builds are not readily available on Windows. --- .github/workflows/ci.yaml | 1 + CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 92aaa4ace..8fbae5248 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -143,6 +143,7 @@ jobs: -DCMAKE_TOOLCHAIN_FILE=${{ env.VCPKG_DEST_WIN }}\scripts\buildsystems\vcpkg.cmake ^ -DVCPKG_TARGET_TRIPLET=x64-windows-static-release ^ -DVERBOSE_CONFIGURE=ON ^ + -DMSVC_RUNTIME_DYNAMIC=OFF ^ --graphviz=build\target_graph.dot cmake --build build diff --git a/CMakeLists.txt b/CMakeLists.txt index f63d00fba..1d9bcd22b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -35,7 +35,7 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Linux") OFF "NOT GUI" OFF ) elseif (MSVC) - feature_option(MSVC_RUNTIME_DYNAMIC "Use MSVC dynamic runtime library (-MD) instead of static (-MT)" OFF) + feature_option(MSVC_RUNTIME_DYNAMIC "Use MSVC dynamic runtime library (-MD) instead of static (-MT)" ON) endif() set(QBT_VER_STATUS "alpha1" CACHE STRING "Project status version. Should be empty for release builds.")