Skip to content

Commit

Permalink
Disable static + thread-safe on Windows w/ CMake (#3622) (#3630)
Browse files Browse the repository at this point in the history
  • Loading branch information
derobins authored Oct 4, 2023
1 parent 51ff48b commit 7b18845
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 6 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -558,6 +558,7 @@ jobs:
if: (matrix.generator != 'autogen') && ! (matrix.thread_safety.enabled)


# NOTE: Windows does not support static + thread-safe
- name: CMake Configure (Thread-Safe)
run: |
mkdir "${{ runner.workspace }}/build"
Expand All @@ -567,6 +568,7 @@ jobs:
-DCMAKE_BUILD_TYPE=${{ matrix.build_mode.cmake }} \
-DCMAKE_TOOLCHAIN_FILE=${{ matrix.toolchain }} \
-DBUILD_SHARED_LIBS=ON \
-DBUILD_STATIC_LIBS=OFF \
-DHDF5_ENABLE_ALL_WARNINGS=ON \
-DHDF5_ENABLE_THREADSAFE:BOOL=ON \
-DHDF5_ENABLE_PARALLEL:BOOL=${{ matrix.parallel }} \
Expand Down
5 changes: 3 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -863,8 +863,9 @@ option (HDF5_ENABLE_THREADSAFE "Enable thread-safety" OFF)
if (HDF5_ENABLE_THREADSAFE)
# check for unsupported options
if (WIN32)
message (VERBOSE " **** thread-safety option not supported with static library **** ")
message (VERBOSE " **** thread-safety option will not be used building static library **** ")
if (BUILD_STATIC_LIBS)
message (FATAL_ERROR " **** thread-safety option not supported with static library **** ")
endif ()
endif ()
if (HDF5_BUILD_FORTRAN)
if (NOT ALLOW_UNSUPPORTED)
Expand Down
14 changes: 10 additions & 4 deletions release_docs/RELEASE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,16 @@ New Features

Configuration:
-------------
-
- Thread-safety + static library disabled on Windows w/ CMake

The thread-safety feature requires hooks in DllMain(), which is only
present in the shared library.

We previously just warned about this, but now any CMake configuration
that tries to build thread-safety and the static library will fail.
This cannot be overridden with ALLOW_UNSUPPORTED.

Fixes GitHub issue #3613


Library:
Expand All @@ -62,9 +71,6 @@ New Features

Fortran Library:
----------------
-


- Removed "-commons" linking option on Darwin, as COMMON and EQUIVALENCE
are no longer used in the Fortran source.

Expand Down

0 comments on commit 7b18845

Please sign in to comment.