Merge pull request #234 from phoebe-team/updateHighFive

Further changes to migrate to HighFive v3
phoebe-team · Dec 27, 2024 · d396e67 · d396e67
2 parents 35a3ed6 + b938ed7
commit d396e67
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/.github/workflows/buildandtest.yml b/.github/workflows/buildandtest.yml
@@ -11,8 +11,8 @@ jobs:
         compiler:
           [
             #"GCC 10",
-            "GCC 14",
-            "Clang 15",
+            "GCC (Latest)",
+            "Clang 16",
             #"Clang 11",
           ]
     env:
@@ -34,13 +34,13 @@ jobs:
         run: |
           CC_VERSION=$( echo "${{ matrix.compiler }}" | awk '{ print $2; }')
           echo "CC_VERSION=${CC_VERSION}" >> "$GITHUB_OUTPUT"
-      - name: Install GCC 
+      - name: Install GCC
         if: ${{ startsWith(matrix.compiler, 'GCC') }}
         run: sudo apt install -y g++ #-${{ steps.extract_matrix.outputs.CC_VERSION }}
       - name: Install Clang
         if: ${{ startsWith(matrix.compiler, 'Clang') }}
         run: |
-          sudo apt install -y clang #-${{ steps.extract_matrix.outputs.CC_VERSION }}
+          sudo apt install -y clang-16 #-${{ steps.extract_matrix.outputs.CC_VERSION }}
           sudo apt install -y libomp-dev #${{ steps.extract_matrix.outputs.CC_VERSION }}-dev
       - name: Configure
         run: |

diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
@@ -73,13 +73,11 @@ if(HDF5_AVAIL)
           -DHIGHFIVE_BUILD_DOCS=OFF
           -DHIGHFIVE_EXAMPLES=OFF
           -DHIGHFIVE_UNIT_TESTS=OFF
-          -DHIGHFIVE_USE_BOOST=OFF
-          -DHIGHFIVE_USE_EIGEN=ON
+          -DHIGHFIVE_TEST_BOOST=OFF
+          -DHIGHFIVE_TEST_EIGEN=ON
           -DHDF5_IS_PARALLEL=${PARALLEL_HDF5}
-          -DHIGHFIVE_USE_OPENCV=OFF
-          -DHIGHFIVE_USE_XTENSOR=OFF
-          -DEIGEN3_INCLUDE_DIRS=${CMAKE_CURRENT_BINARY_DIR}/eigen_src
-          -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}
+          -DHIGHFIVE_TEST_OPENCV=OFF
+          -DHIGHFIVE_TEST_XTENSOR=OFF
 )
 endif()