Prefer Windows threads on Win32 builds (over C11) for now

Signed-off-by: Quincey Koziol <[email protected]>
qkoziol · Apr 11, 2024 · 0842e56 · 0842e56
1 parent 232c6de
commit 0842e56
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -752,12 +752,12 @@ if (Threads_FOUND)
 
   # Determine which threading package to use
   CHECK_INCLUDE_FILE("threads.h" HAVE_THREADS_H)
-  if (HAVE_THREADS_H)
-    # When C11 threads are available, those are the top choice
-    set (H5_HAVE_C11_THREADS 1)
-  elseif (WIN32)
+  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
+    set (H5_HAVE_C11_THREADS 1)
   else ()
     if (NOT H5_HAVE_PTHREAD_H)
       message (FATAL_ERROR " **** thread support requires C11 threads, Win32 threads or Pthreads **** ")

diff --git a/HDF5Examples/CMakeLists.txt b/HDF5Examples/CMakeLists.txt
@@ -103,12 +103,12 @@ if (Threads_FOUND)
 
   # Determine which threading package to use
   CHECK_INCLUDE_FILE("threads.h" HAVE_THREADS_H)
-  if (HAVE_THREADS_H)
-    # When C11 threads are available, those are the top choice
-    set (H5_HAVE_C11_THREADS 1)
-  elseif (WIN32)
+  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
+    set (H5_HAVE_C11_THREADS 1)
   else ()
     if (NOT H5_HAVE_PTHREAD_H)
       message (FATAL_ERROR " **** thread support requires C11 threads, Win32 threads or Pthreads **** ")