Skip to content

Commit 93b48d5

Browse files
committed
Docs: Catch2 v2.6.1+
1 parent 60d9450 commit 93b48d5

File tree

5 files changed

+7
-6
lines changed

5 files changed

+7
-6
lines changed

CHANGELOG.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ Other
3131
- Python: remove (inofficial) bindings for 2.7 #435
3232
- CMake 3.12+: apply policy ``CMP0074`` for ``<Package>_ROOT`` vars #391 #464
3333
- MPark.Variant: updated to 1.4.0+ #465
34+
- Catch2: updated to 2.6.1+ #466
3435
- Docs:
3536

3637
- PyPI install method #450 #451

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -384,9 +384,9 @@ if(BUILD_TESTING)
384384
target_include_directories(openPMD::thirdparty::Catch2 SYSTEM INTERFACE
385385
$<BUILD_INTERFACE:${openPMD_SOURCE_DIR}/share/openPMD/thirdParty/catch2/include>
386386
)
387-
message(STATUS "Catch2: Using INTERNAL version 2.3.0")
387+
message(STATUS "Catch2: Using INTERNAL version 2.6.1")
388388
else()
389-
find_package(Catch2 2.3.0 CONFIG REQUIRED)
389+
find_package(Catch2 2.6.1 CONFIG REQUIRED)
390390
target_link_libraries(openPMD::thirdparty::Catch2
391391
INTERFACE Catch2::Catch2)
392392
message(STATUS "Catch2: Found version ${Catch2_VERSION}")

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ Required:
9696

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

@@ -209,7 +209,7 @@ The following options allow to switch to external installs:
209209
| CMake Option | Values | Library | Version |
210210
|---------------------------------|------------|---------------|---------|
211211
| `openPMD_USE_INTERNAL_VARIANT` | **ON**/OFF | MPark.Variant | 1.4.0+ |
212-
| `openPMD_USE_INTERNAL_CATCH` | **ON**/OFF | Catch2 | 2.3.0+ |
212+
| `openPMD_USE_INTERNAL_CATCH` | **ON**/OFF | Catch2 | 2.6.1+ |
213213
| `openPMD_USE_INTERNAL_PYBIND11` | **ON**/OFF | pybind11 | 2.2.4+ |
214214
| `openPMD_USE_INTERNAL_JSON` | **ON**/OFF | NLohmann-JSON | 3.4.0+ |
215215

docs/source/dev/buildoptions.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ The following options allow to switch to external installs of dependencies:
7272
CMake Option Values Installs Library Version
7373
================================= =========== ======== ============= ========
7474
``openPMD_USE_INTERNAL_VARIANT`` **ON**/OFF Yes MPark.Variant 1.4.0+
75-
``openPMD_USE_INTERNAL_CATCH`` **ON**/OFF No Catch2 2.3.0+
75+
``openPMD_USE_INTERNAL_CATCH`` **ON**/OFF No Catch2 2.6.1+
7676
``openPMD_USE_INTERNAL_PYBIND11`` **ON**/OFF No pybind11 2.2.4+
7777
``openPMD_USE_INTERNAL_JSON`` **ON**/OFF No NLohmann-JSON 3.4.0+
7878
================================= =========== ======== ============= ========

docs/source/dev/dependencies.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Shipped internally
2020
The following libraries are shipped internally in ``share/openPMD/thirdParty/`` for convenience:
2121

2222
* `MPark.Variant <https://github.com/mpark/variant>`_ 1.4.0+ (`BSL-1.0 <https://github.com/mpark/variant/blob/master/LICENSE.md>`_)
23-
* `Catch2 <https://github.com/catchorg/Catch2>`_ 2.3.0+ (`BSL-1.0 <https://github.com/catchorg/Catch2/blob/master/LICENSE.txt>`_)
23+
* `Catch2 <https://github.com/catchorg/Catch2>`_ 2.6.1+ (`BSL-1.0 <https://github.com/catchorg/Catch2/blob/master/LICENSE.txt>`_)
2424
* `pybind11 <https://github.com/pybind/pybind11>`_ 2.2.4+ (`new BSD <https://github.com/pybind/pybind11/blob/master/LICENSE>`_)
2525
* `NLohmann-JSON <https://github.com/nlohmann/json>`_ 3.4.0+ (`MIT <https://github.com/nlohmann/json/blob/develop/LICENSE.MIT>`_)
2626

0 commit comments

Comments
 (0)