Browse Source

Merge pull request #13450 from jagannatharjun/cmake-fix

By default use dynamic runtime with MSVC on CMake
adaptive-webui-19844
Mike Tzou 4 years ago committed by GitHub
parent
commit
0284721ba2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      .github/workflows/ci.yaml
  2. 2
      CMakeLists.txt

1
.github/workflows/ci.yaml

@ -143,6 +143,7 @@ jobs: @@ -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

2
CMakeLists.txt

@ -35,7 +35,7 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Linux") @@ -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.")

Loading…
Cancel
Save