Merge branch 'master' into metrics

google · Sep 16, 2024 · 5ccd98e · 5ccd98e
2 parents 6b13156 + a38a7e9
commit 5ccd98e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -140,7 +140,7 @@ jobs:
           & $Env:GITHUB_WORKSPACE\.github\workflows\vsenv.ps1 -arch x64 -hostArch x64
           mkdir build64
           pushd build64
-          cmake -DCMAKE_POSITION_INDEPENDENT_CODE=TRUE -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS_RELEASE=/MT -DCMAKE_CXX_FLAGS_RELEASE=/MT -GNinja ..
+          cmake -DCMAKE_POSITION_INDEPENDENT_CODE=TRUE -DCMAKE_BUILD_TYPE=Release -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded -GNinja ..
           ninja
           popd
 

diff --git a/BUILDING.md b/BUILDING.md
@@ -110,8 +110,7 @@ mkdir build64
 cd build64
 cmake -DCMAKE_POSITION_INDEPENDENT_CODE=TRUE ^
       -DCMAKE_BUILD_TYPE=Release ^
-      -DCMAKE_C_FLAGS_RELEASE=/MT ^
-      -DCMAKE_CXX_FLAGS_RELEASE=/MT ^
+      -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded ^
       -GNinja ..
 ninja
 ```