diff --git a/.github/workflows/ci-workflow.yml b/.github/workflows/ci-workflow.yml index c1989bd6d19..8f24157a065 100644 --- a/.github/workflows/ci-workflow.yml +++ b/.github/workflows/ci-workflow.yml @@ -273,8 +273,8 @@ jobs: run: | call "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars64.bat" set KUZU_TESTING=1 - set CFLAGS=/MDd - set CXXFLAGS=/MDd /std:c++20 + set CFLAGS=/MD + set CXXFLAGS=/MD /std:c++20 cargo test --locked -- --test-threads=1 - name: Java test diff --git a/tools/rust_api/build.rs b/tools/rust_api/build.rs index b44edf715b8..d4827037ad1 100644 --- a/tools/rust_api/build.rs +++ b/tools/rust_api/build.rs @@ -21,11 +21,7 @@ fn link_libraries() { println!("cargo:rustc-link-lib={}=kuzu", link_mode()); if link_mode() == "static" { if cfg!(windows) { - if get_target() == "debug" { - println!("cargo:rustc-link-lib=dylib=msvcrtd"); - } else { - println!("cargo:rustc-link-lib=dylib=msvcrt"); - } + println!("cargo:rustc-link-lib=dylib=msvcrt"); println!("cargo:rustc-link-lib=dylib=shell32"); println!("cargo:rustc-link-lib=dylib=ole32"); } else if cfg!(target_os = "macos") { @@ -67,6 +63,8 @@ fn build_bundled_cmake() -> Result, Box> { if cfg!(windows) { build.generator("Ninja"); build.cxxflag("/EHsc"); + build.define("CMAKE_MSVC_RUNTIME_LIBRARY", "MultiThreadedDLL"); + build.define("CMAKE_POLICY_DEFAULT_CMP0091", "NEW"); } let build_dir = build.build(); @@ -139,6 +137,7 @@ fn build_ffi( if cfg!(windows) { build.flag("/std:c++20"); + build.flag("/MD"); } else { build.flag("-std=c++2a"); }