Skip to content

Link MSVC runtime library statically #427

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
staticlibs wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Link MSVC runtime library statically #427

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/Java.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,6 +389,7 @@ jobs:
shell: cmd
run: |
call "c:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
dumpbin.exe /imports build\release\Release\libduckdb_java.so_windows_amd64
dumpbin.exe /exports build\release\Release\libduckdb_java.so_windows_amd64

- name: Java Tests
Expand Down Expand Up @@ -432,6 +433,7 @@ jobs:
shell: cmd
run: |
call "c:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsarm64.bat"
dumpbin.exe /imports build\release\Release\libduckdb_java.so_windows_arm64
dumpbin.exe /exports build\release\Release\libduckdb_java.so_windows_arm64

# Test runs are failing because windows_arm64 extensions are missing
Expand Down
6 changes: 2 additions & 4 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ cmake_minimum_required(VERSION 3.5...3.29)
set(CMAKE_CXX_STANDARD "11" CACHE STRING "C++ standard to enforce")
set(CMAKE_VERBOSE_MAKEFILE OFF)
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")

if(NOT JNI_FOUND OR NOT Java_FOUND)
message(FATAL_ERROR "No compatible Java/JNI found")
Expand Down Expand Up @@ -625,10 +626,7 @@ target_compile_definitions(duckdb_java PRIVATE
-DDUCKDB_EXTENSION_AUTOLOAD_DEFAULT
-DDUCKDB_EXTENSION_AUTOINSTALL_DEFAULT)

if(MSVC)
target_compile_definitions(duckdb_java PRIVATE
-D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR)
else()
if(NOT MSVC)
target_compile_definitions(duckdb_java PRIVATE
-DDUCKDB_EXTENSION_JEMALLOC_LINKED)
endif()
Expand Down
6 changes: 2 additions & 4 deletions CMakeLists.txt.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ cmake_minimum_required(VERSION 3.5...3.29)
set(CMAKE_CXX_STANDARD "11" CACHE STRING "C++ standard to enforce")
set(CMAKE_VERBOSE_MAKEFILE OFF)
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")

if(NOT JNI_FOUND OR NOT Java_FOUND)
message(FATAL_ERROR "No compatible Java/JNI found")
Expand Down Expand Up @@ -151,10 +152,7 @@ target_compile_definitions(duckdb_java PRIVATE
-DDUCKDB_EXTENSION_AUTOLOAD_DEFAULT
-DDUCKDB_EXTENSION_AUTOINSTALL_DEFAULT)

if(MSVC)
target_compile_definitions(duckdb_java PRIVATE
-D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR)
else()
if(NOT MSVC)
target_compile_definitions(duckdb_java PRIVATE
-DDUCKDB_EXTENSION_JEMALLOC_LINKED)
endif()
Expand Down