Merge pull request #3922 from vicentebolea/backport-3893

Merge pull request #3893 from vicentebolea/find-threads-earlier
ornladios · Nov 16, 2023 · 26cc34f · 26cc34f
2 parents 83cb06a + a22bf34
commit 26cc34f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/everything.yml b/.github/workflows/everything.yml
@@ -66,7 +66,7 @@ jobs:
 
     runs-on: ubuntu-latest
     container:
-      image: ornladios/adios2:ci-formatting
+      image: docker.io/ornladios/adios2:ci-formatting
 
     steps:
       - uses: actions/checkout@v4
@@ -94,7 +94,7 @@ jobs:
 
     runs-on: ubuntu-latest
     container:
-      image: ornladios/adios2:ci-spack-el8-${{ matrix.compiler }}-${{ matrix.parallel }}
+      image: docker.io/ornladios/adios2:ci-spack-el8-${{ matrix.compiler }}-${{ matrix.parallel }}
       options: --shm-size=1g
       env:
         GH_YML_JOBNAME: ${{ matrix.os }}-${{ matrix.gpu_backend }}${{ matrix.compiler }}-${{ matrix.parallel }}

diff --git a/cmake/DetectOptions.cmake b/cmake/DetectOptions.cmake
@@ -67,6 +67,9 @@ function(lists_get_prefix listVars outVar)
   set(${outVar} "${prefix}" PARENT_SCOPE)
 endfunction()
 
+# Multithreading
+find_package(Threads REQUIRED)
+
 # Blosc2
 if(ADIOS2_USE_Blosc2 STREQUAL AUTO)
   # Prefect CONFIG mode
@@ -544,9 +547,6 @@ if(AWSSDK_FOUND)
     set(ADIOS2_HAVE_AWSSDK TRUE)
 endif()
 
-# Multithreading
-find_package(Threads REQUIRED)
-
 # Floating point detection
 include(CheckTypeRepresentation)