From 3fbf18ec19d0342734b4a118603385979c5072bb Mon Sep 17 00:00:00 2001 From: Elliana May Date: Tue, 11 Jun 2024 11:19:55 +0800 Subject: [PATCH] add _DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR definition to fix windows build --- .github/workflows/Java.yml | 2 +- CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/Java.yml b/.github/workflows/Java.yml index 438e2247..211214c6 100644 --- a/.github/workflows/Java.yml +++ b/.github/workflows/Java.yml @@ -100,7 +100,7 @@ jobs: java-windows-amd64: - name: Java Windows (arm64) + name: Java Windows (amd64) runs-on: windows-latest needs: java-linux-amd64 steps: diff --git a/CMakeLists.txt b/CMakeLists.txt index 9515987d..ba550325 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,7 +32,7 @@ set(CMAKE_JAVA_COMPILE_FLAGS -source 1.8 -target 1.8 -encoding utf-8) add_definitions(-DDUCKDB_BUILD_LIBRARY) if(MSVC) - add_definitions(/bigobj) + add_definitions(/bigobj /D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR) else() set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -DNDEBUG ") set(CMAKE_C_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}")