diff --git a/CHANGELOG.rst b/CHANGELOG.rst index a34edc1581..ad38af5cfd 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -17,7 +17,7 @@ Changes to "0.14.0" Features """""""" -- include internally shipped toml11 v3.7.0 #1148 +- include internally shipped toml11 v3.7.1 #1148 #1227 - pybind11: require version 2.9.1+ #1220 Bug Fixes diff --git a/CMakeLists.txt b/CMakeLists.txt index c776fbc47a..17ec82d33d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -211,10 +211,11 @@ target_link_libraries(openPMD::thirdparty::nlohmann_json # external library: toml11 if(openPMD_USE_INTERNAL_TOML11) + set(toml11_INSTALL OFF CACHE INTERNAL "") add_subdirectory("${openPMD_SOURCE_DIR}/share/openPMD/thirdParty/toml11") - message(STATUS "toml11: Using INTERNAL version '3.7.0'") + message(STATUS "toml11: Using INTERNAL version '3.7.1'") else() - find_package(toml11 3.7.0 CONFIG REQUIRED) + find_package(toml11 3.7.1 CONFIG REQUIRED) message(STATUS "toml11: Found version '${toml11_VERSION}'") endif() add_library(openPMD::thirdparty::toml11 INTERFACE IMPORTED) diff --git a/NEWS.rst b/NEWS.rst index baf0caf8f8..264225f275 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -10,7 +10,7 @@ Building openPMD-api now requires a compiler that supports C++17 or newer. ``MPark.Variant`` is not a dependency anymore (kudos and thanks for the great time!). Python 3.10 is now supported. -openPMD-api now depends on `toml11 `__ 3.7.0+. +openPMD-api now depends on `toml11 `__ 3.7.1+. pybind11 2.9.1 is now the minimally supported version for Python support. The following backend-specific members of the ``Dataset`` class have been removed: ``Dataset::setChunkSize()``, ``Dataset::setCompression()``, ``Dataset::setCustomTransform()``, ``Dataset::chunkSize``, ``Dataset::compression``, ``Dataset::transform``. diff --git a/README.md b/README.md index 5710039873..eabdc58d10 100644 --- a/README.md +++ b/README.md @@ -106,7 +106,7 @@ Shipped internally in `share/openPMD/thirdParty/`: * [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.9.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)) -* [toml11](https://github.com/ToruNiina/toml11) 3.7.0+ ([MIT](https://github.com/ToruNiina/toml11/blob/master/LICENSE)) +* [toml11](https://github.com/ToruNiina/toml11) 3.7.1+ ([MIT](https://github.com/ToruNiina/toml11/blob/master/LICENSE)) I/O backends: * [JSON](https://en.wikipedia.org/wiki/JSON) @@ -273,7 +273,7 @@ The following options allow to switch to external installs: | `openPMD_USE_INTERNAL_CATCH` | **ON**/OFF | Catch2 | 2.13.4+ | | `openPMD_USE_INTERNAL_PYBIND11` | **ON**/OFF | pybind11 | 2.9.1+ | | `openPMD_USE_INTERNAL_JSON` | **ON**/OFF | NLohmann-JSON | 3.9.1+ | -| `openPMD_USE_INTERNAL_TOML11` | **ON**/OFF | toml11 | 3.7.0+ | +| `openPMD_USE_INTERNAL_TOML11` | **ON**/OFF | toml11 | 3.7.1+ | By default, this will build as a shared library (`libopenPMD.[so|dylib|dll]`) and installs also its headers. In order to build a static library, append `-DBUILD_SHARED_LIBS=OFF` to the `cmake` command. diff --git a/docs/source/dev/buildoptions.rst b/docs/source/dev/buildoptions.rst index 61ee43e95e..d22b6117bf 100644 --- a/docs/source/dev/buildoptions.rst +++ b/docs/source/dev/buildoptions.rst @@ -71,7 +71,7 @@ CMake Option Values Installs Library Version ``openPMD_USE_INTERNAL_CATCH`` **ON**/OFF No Catch2 2.13.4+ ``openPMD_USE_INTERNAL_PYBIND11`` **ON**/OFF No pybind11 2.9.1+ ``openPMD_USE_INTERNAL_JSON`` **ON**/OFF No NLohmann-JSON 3.9.1+ -``openPMD_USE_INTERNAL_TOML11`` **ON**/OFF No toml11 3.7.0+ +``openPMD_USE_INTERNAL_TOML11`` **ON**/OFF No toml11 3.7.1+ ================================= =========== ======== ============= ======== diff --git a/docs/source/dev/dependencies.rst b/docs/source/dev/dependencies.rst index 01f80698a4..243b74649e 100644 --- a/docs/source/dev/dependencies.rst +++ b/docs/source/dev/dependencies.rst @@ -20,7 +20,7 @@ The following libraries are shipped internally in ``share/openPMD/thirdParty/`` * `Catch2 `_ 2.13.4+ (`BSL-1.0 `__) * `pybind11 `_ 2.9.1+ (`new BSD `_) * `NLohmann-JSON `_ 3.9.1+ (`MIT `_) -* `toml11 `_ 3.7.0+ (`MIT `__) +* `toml11 `_ 3.7.1+ (`MIT `__) Optional: I/O backends ----------------------