Skip to content
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

Disable static + thread-safe on Windows w/ CMake (#3622) #3630

Merged
merged 4 commits into from
Oct 4, 2023
Merged

Disable static + thread-safe on Windows w/ CMake (#3622) #3630

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fe0bd36
Disable static + thread-safe on Windows w/ CMake (#3622)
derobins Oct 3, 2023
e6d2dae
Disable CMake static + threadsafe in CI
derobins Oct 4, 2023
3145865
Merge remote-tracking branch 'canonical/hdf5_1_14' into 14_windows_st…
derobins Oct 4, 2023
6b06a26
Disable STATIC builds in TS CI...
derobins Oct 4, 2023
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
3 changes: 2 additions & 1 deletion .github/workflows/main.yml
View file
Open in desktop
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 @@ -566,7 +567,7 @@ jobs:
${{ matrix.generator }} \
-DCMAKE_BUILD_TYPE=${{ matrix.build_mode.cmake }} \
-DCMAKE_TOOLCHAIN_FILE=${{ matrix.toolchain }} \
-DBUILD_SHARED_LIBS=ON \
-DBUILD_SHARED_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
View file
Open in desktop
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
View file
Open in desktop
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
Loading