Skip to content

Commit

Permalink
Rework CMake code for v3.0.0. (#897)
Browse files Browse the repository at this point in the history
Please consult `README.md`, the migration guide and
`test/cmake_integration` for information about what changed.
  • Loading branch information
1uc authored Feb 14, 2024
1 parent f71c7c4 commit 2877159
Show file tree
Hide file tree
Showing 41 changed files with 867 additions and 741 deletions.
26 changes: 13 additions & 13 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,22 +41,22 @@ jobs:
- config:
os: ubuntu-20.04
pkgs: ''
flags: '-DHIGHFIVE_USE_BOOST:Bool=OFF'
flags: '-DHIGHFIVE_TEST_BOOST:Bool=OFF'
- config:
os: ubuntu-20.04
pkgs: 'libboost-all-dev libopencv-dev'
flags: '-DHIGHFIVE_USE_OPENCV:Bool=ON -GNinja'
flags: '-DHIGHFIVE_TEST_OPENCV:Bool=ON -GNinja'
- config:
os: ubuntu-latest
pkgs: 'libboost-all-dev libeigen3-dev libopencv-dev'
flags: '-DHIGHFIVE_USE_EIGEN:Bool=ON -DHIGHFIVE_USE_OPENCV:Bool=ON -GNinja'
flags: '-DHIGHFIVE_TEST_EIGEN:Bool=ON -DHIGHFIVE_TEST_OPENCV:Bool=ON -GNinja'
- config:
os: ubuntu-20.04
pkgs: 'libboost-all-dev'
flags: '-DCMAKE_CXX_STANDARD=17'
- config:
os: ubuntu-22.04
flags: '-DHIGHFIVE_USE_BOOST=Off -DCMAKE_CXX_STANDARD=20'
flags: '-DHIGHFIVE_TEST_BOOST=Off -DCMAKE_CXX_STANDARD=20'

steps:
- uses: actions/checkout@v3
Expand Down Expand Up @@ -195,8 +195,8 @@ jobs:
run: |
CMAKE_OPTIONS=(
-GNinja
-DHIGHFIVE_USE_BOOST:BOOL=ON
-DHIGHFIVE_USE_EIGEN:BOOL=ON
-DHIGHFIVE_TEST_BOOST:BOOL=ON
-DHIGHFIVE_TEST_EIGEN:BOOL=ON
-DHIGHFIVE_BUILD_DOCS:BOOL=FALSE
-DHIGHFIVE_GLIBCXX_ASSERTIONS=${HIGHFIVE_GLIBCXX_ASSERTIONS:-OFF}
-DHIGHFIVE_SANITIZER=${HIGHFIVE_SANITIZER:-OFF}
Expand Down Expand Up @@ -246,7 +246,7 @@ jobs:
sudo apt-get -qq install libhdf5-openmpi-dev
- name: "CMake Project Integration"
run: bash tests/test_project_integration.sh
run: bash tests/cmake_integration/test_cmake_integration.sh


# Job checking the benchmarks work
Expand Down Expand Up @@ -291,9 +291,9 @@ jobs:
run: |
CMAKE_OPTIONS=(
-GNinja
-DHIGHFIVE_USE_BOOST:BOOL=ON
-DHIGHFIVE_USE_EIGEN:BOOL=ON
-DHIGHFIVE_USE_XTENSOR:BOOL=ON
-DHIGHFIVE_TEST_BOOST:BOOL=ON
-DHIGHFIVE_TEST_EIGEN:BOOL=ON
-DHIGHFIVE_TEST_XTENSOR:BOOL=ON
-DHIGHFIVE_BUILD_DOCS:BOOL=FALSE
-DHIGHFIVE_TEST_SINGLE_INCLUDES=ON
-DCMAKE_CXX_FLAGS="-coverage -O0"
Expand Down Expand Up @@ -348,9 +348,9 @@ jobs:
-T ${{matrix.vs-toolset}}
-DCMAKE_CXX_STANDARD=${{matrix.cxxstd}}
-DHIGHFIVE_UNIT_TESTS=ON
-DHIGHFIVE_USE_BOOST:BOOL=ON
-DHIGHFIVE_USE_EIGEN:BOOL=ON
-DHIGHFIVE_USE_XTENSOR:BOOL=ON
-DHIGHFIVE_TEST_BOOST:BOOL=ON
-DHIGHFIVE_TEST_EIGEN:BOOL=ON
-DHIGHFIVE_TEST_XTENSOR:BOOL=ON
-DHIGHFIVE_TEST_SINGLE_INCLUDES=ON
)
source $GITHUB_WORKSPACE/.github/build.sh
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@ jobs:
run: |
CMAKE_OPTIONS=(
-GNinja
-DHIGHFIVE_USE_BOOST:BOOL=ON
-DHIGHFIVE_USE_EIGEN:BOOL=ON
-DHIGHFIVE_USE_OPENCV:BOOL=ON
#-DHIGHFIVE_USE_XTENSOR:BOOL=ON
-DHIGHFIVE_TEST_BOOST:BOOL=ON
-DHIGHFIVE_TEST_EIGEN:BOOL=ON
-DHIGHFIVE_TEST_OPENCV:BOOL=ON
#-DHIGHFIVE_TEST_XTENSOR:BOOL=ON
-DHIGHFIVE_TEST_SINGLE_INCLUDES=ON
-DHIGHFIVE_BUILD_DOCS:BOOL=FALSE
-DCMAKE_CXX_FLAGS="-coverage -O0"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/version_file.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
- name: Build
run: |
# Will trigger `configure_file` for H5Version.hpp.
cmake -DHIGHFIVE_USE_BOOST=Off -B build .
cmake -B build .
- name: Test
run: |
Expand Down
74 changes: 0 additions & 74 deletions CMake/HighFiveConfig.cmake.in

This file was deleted.

122 changes: 0 additions & 122 deletions CMake/HighFiveTargetDeps.cmake

This file was deleted.

48 changes: 0 additions & 48 deletions CMake/HighFiveTargetExport.cmake

This file was deleted.

Loading

0 comments on commit 2877159

Please sign in to comment.