diff --git a/CMakeLists.txt b/CMakeLists.txt index ab9e1cee..fb412366 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,6 +6,7 @@ project(duckdb_py LANGUAGES CXX) set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_EXTENSIONS OFF) +set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") # Set the library name set(DUCKDB_PYTHON_LIB_NAME "_duckdb") diff --git a/cmake/duckdb_loader.cmake b/cmake/duckdb_loader.cmake index 2fc738fb..c9c77bb3 100644 --- a/cmake/duckdb_loader.cmake +++ b/cmake/duckdb_loader.cmake @@ -198,8 +198,6 @@ function(_duckdb_create_interface_target target_name) /wd26451 /wd26495 # suppress Code Analysis /D_CRT_SECURE_NO_WARNINGS # suppress warnings about unsafe functions - /D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR # see - # https://github.com/duckdblabs/duckdb-internal/issues/5151 /utf-8 # treat source files as UTF-8 encoded ) elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")