Skip to content

Catch2: 2.13.4+ #940

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

Merged
merged 5 commits into from
Mar 8, 2021
Merged

Catch2: 2.13.4+ #940

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9740a83
Catch2: 2.13.4
horenmar Mar 8, 2021
da7d58f
Docs: Catch2 v2.13.4
ax3l Mar 8, 2021
1007472
SerialIOTest: Fix -Wsign-compare
ax3l Mar 8, 2021
1b91b63
CI: Add missing apt-get update lines
ax3l Mar 8, 2021
495b00d
ParallelIOTest: Fix -Wsign-compare
ax3l Mar 8, 2021
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
7 changes: 7 additions & 0 deletions .github/workflows/unix.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ jobs:
with: {path: /opt/spack, key: clangtidy10_nopy_ompi_h5_ad1_ad2 }
- name: Install
run: |
sudo apt-get update
sudo apt-get install clang clang-tidy gfortran libopenmpi-dev python
sudo .github/workflows/dependencies/install_spack
- name: Build
Expand All @@ -36,6 +37,7 @@ jobs:
with: {path: /opt/spack, key: clang5_nopy_nompi_h5 }
- name: Install
run: |
sudo apt-get update
sudo apt-get install clang-5.0
sudo .github/workflows/dependencies/install_spack
- name: Build
Expand All @@ -59,6 +61,7 @@ jobs:
with: {path: /opt/spack, key: clang5_nopy_ompi_h5_ad1_ad2_bp3 }
- name: Install
run: |
sudo apt-get update
sudo apt-get install clang-5.0 gfortran libopenmpi-dev python3
sudo .github/workflows/dependencies/install_spack
- name: Build
Expand Down Expand Up @@ -87,6 +90,7 @@ jobs:
with: {path: /opt/spack, key: clang5_nopy_ompi_h5_ad1_ad2_bp3 }
- name: Install
run: |
sudo apt-get update
sudo apt-get install clang-5.0 gfortran libopenmpi-dev python3
sudo .github/workflows/dependencies/install_spack
- name: Build
Expand All @@ -111,6 +115,7 @@ jobs:
- uses: actions/checkout@v2
- name: Install
run: |
sudo apt-get update
sudo apt-get install clang-10 libc++-dev libc++abi-dev libhdf5-dev python3
python3 -m pip install -U pip
python3 -m pip install -U numpy
Expand Down Expand Up @@ -178,6 +183,7 @@ jobs:
with: {path: /opt/spack, key: gcc5_py36_ompi_h5_ad1_ad2 }
- name: Install
run: |
sudo apt-get update
sudo apt-get install g++-5 gfortran libopenmpi-dev python3 python3-setuptools
sudo .github/workflows/dependencies/install_spack
python3 -m pip install -U pip
Expand All @@ -202,6 +208,7 @@ jobs:
- uses: actions/checkout@v2
- name: Install
run: |
sudo apt-get update
sudo apt-get install g++ libopenmpi-dev libhdf5-openmpi-dev libadios-dev python3 python3-numpy python3-mpi4py python3-pandas
# TODO ADIOS1 (.pc file broken?) ADIOS2
- name: Build
Expand Down
4 changes: 2 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,9 +440,9 @@ if(openPMD_BUILD_TESTING)
target_include_directories(openPMD::thirdparty::Catch2 SYSTEM INTERFACE
$<BUILD_INTERFACE:${openPMD_SOURCE_DIR}/share/openPMD/thirdParty/catch2/include>
)
message(STATUS "Catch2: Using INTERNAL version '2.6.1'")
message(STATUS "Catch2: Using INTERNAL version '2.13.4'")
else()
find_package(Catch2 2.6.1 REQUIRED CONFIG)
find_package(Catch2 2.13.4 REQUIRED CONFIG)
target_link_libraries(openPMD::thirdparty::Catch2
INTERFACE Catch2::Catch2)
message(STATUS "Catch2: Found version '${Catch2_VERSION}'")
Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ Required:

Shipped internally in `share/openPMD/thirdParty/`:
* [MPark.Variant](https://github.com/mpark/variant) 1.4.0+ ([BSL-1.0](https://github.com/mpark/variant/blob/master/LICENSE.md))
* [Catch2](https://github.com/catchorg/Catch2) 2.6.1+ ([BSL-1.0](https://github.com/catchorg/Catch2/blob/master/LICENSE.txt))
* [Catch2](https://github.com/catchorg/Catch2) 2.13.4+ ([BSL-1.0](https://github.com/catchorg/Catch2/blob/master/LICENSE.txt))
* [pybind11](https://github.com/pybind/pybind11) 2.6.1+ ([new BSD](https://github.com/pybind/pybind11/blob/master/LICENSE))
* [NLohmann-JSON](https://github.com/nlohmann/json) 3.9.1+ ([MIT](https://github.com/nlohmann/json/blob/develop/LICENSE.MIT))

Expand Down Expand Up @@ -259,7 +259,7 @@ The following options allow to switch to external installs:
| CMake Option | Values | Library | Version |
|---------------------------------|------------|---------------|---------|
| `openPMD_USE_INTERNAL_VARIANT` | **ON**/OFF | MPark.Variant | 1.4.0+ |
| `openPMD_USE_INTERNAL_CATCH` | **ON**/OFF | Catch2 | 2.6.1+ |
| `openPMD_USE_INTERNAL_CATCH` | **ON**/OFF | Catch2 | 2.13.4+ |
| `openPMD_USE_INTERNAL_PYBIND11` | **ON**/OFF | pybind11 | 2.6.1+ |
| `openPMD_USE_INTERNAL_JSON` | **ON**/OFF | NLohmann-JSON | 3.9.1+ |

Expand Down
2 changes: 1 addition & 1 deletion docs/source/dev/buildoptions.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ The following options allow to switch to external installs of dependencies:
CMake Option Values Installs Library Version
================================= =========== ======== ============= ========
``openPMD_USE_INTERNAL_VARIANT`` **ON**/OFF Yes MPark.Variant 1.4.0+
``openPMD_USE_INTERNAL_CATCH`` **ON**/OFF No Catch2 2.6.1+
``openPMD_USE_INTERNAL_CATCH`` **ON**/OFF No Catch2 2.13.4+
``openPMD_USE_INTERNAL_PYBIND11`` **ON**/OFF No pybind11 2.6.1+
``openPMD_USE_INTERNAL_JSON`` **ON**/OFF No NLohmann-JSON 3.9.1+
================================= =========== ======== ============= ========
Expand Down
2 changes: 1 addition & 1 deletion docs/source/dev/dependencies.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Shipped internally
The following libraries are shipped internally in ``share/openPMD/thirdParty/`` for convenience:

* `MPark.Variant <https://github.com/mpark/variant>`_ 1.4.0+ (`BSL-1.0 <https://github.com/mpark/variant/blob/master/LICENSE.md>`_)
* `Catch2 <https://github.com/catchorg/Catch2>`_ 2.6.1+ (`BSL-1.0 <https://github.com/catchorg/Catch2/blob/master/LICENSE.txt>`__)
* `Catch2 <https://github.com/catchorg/Catch2>`_ 2.13.4+ (`BSL-1.0 <https://github.com/catchorg/Catch2/blob/master/LICENSE.txt>`__)
* `pybind11 <https://github.com/pybind/pybind11>`_ 2.6.1+ (`new BSD <https://github.com/pybind/pybind11/blob/master/LICENSE>`_)
* `NLohmann-JSON <https://github.com/nlohmann/json>`_ 3.9.1+ (`MIT <https://github.com/nlohmann/json/blob/develop/LICENSE.MIT>`_)

Expand Down
Loading