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

Jump to bottom

Enable threads for Windows #5034

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

Enable threads for Windows #5034

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fb3137c
Enable threads for Windows
hyoklee Oct 29, 2024
d38c2c7
Enable threads for Windows
hyoklee Oct 29, 2024
5718961
Reorder C11 and Win32 thread selection
derobins Nov 4, 2024
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
15 changes: 6 additions & 9 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -800,16 +800,13 @@ if (Threads_FOUND)
set (CMAKE_REQUIRED_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})

# Determine which threading package to use
# Comment out check for C11 threads for now, since it conflicts with the
# current --std=c99 compile flags at configuration time. When we switch to
# --std=c11, this can be uncommented.
#CHECK_INCLUDE_FILE("threads.h" HAVE_THREADS_H)
if (WIN32)
# When Win32 is available, we use those threads
set (H5_HAVE_WIN_THREADS 1)
elseif (HAVE_THREADS_H)
# When C11 threads are available, those are the top choice
CHECK_INCLUDE_FILE("threads.h" HAVE_THREADS_H)
if (HAVE_THREADS_H)
# Prefer C11 threads
set (H5_HAVE_C11_THREADS 1)
elseif (WIN32)
# On Windows, if we didn't find C11 threads, use Win32 threads instead
set (H5_HAVE_WIN_THREADS 1)
elseif (CMAKE_USE_PTHREADS_INIT)
set (H5_HAVE_PTHREAD_H 1)
else ()
Expand Down
Loading