Skip to content

Commit

Permalink
Remove version updates. Update README.md
Browse files Browse the repository at this point in the history
  • Loading branch information
DerNils-git committed Jan 4, 2024
1 parent 8d7dbd6 commit 0e624d4
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 16 deletions.
11 changes: 4 additions & 7 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@
#
cmake_minimum_required(VERSION 3.24.0)

project(openPMD LANGUAGES CXX VERSION 0.16.0)

set(CMAKE_CXX_STANDARD 17)
project(openPMD VERSION 0.16.0) # LANGUAGES CXX

# the openPMD "markup"/"schema" standard version
set(openPMD_STANDARD_VERSION 1.1.0)
Expand Down Expand Up @@ -267,10 +265,9 @@ if(NOT toml11_FOUND)
FetchContent_Declare(
toml11
GIT_REPOSITORY https://github.com/ToruNiina/toml11
# The last released version generates a CMake compatibility warning
# As soon as a new version solving this issue is released replace
# git hash by version tag
GIT_TAG 01a0e93e5f9bef09a76d22f3d51a5257e3d923fe
# Migrate to the latest commit to remove CMake Warning which is not yet
# available in any official release.
GIT_TAG v3.7.1
SOURCE_DIR "${openPMD_SOURCE_DIR}/share/openPMD/thirdParty/toml11/"
OVERRIDE_FIND_PACKAGE
)
Expand Down
15 changes: 6 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -261,15 +261,12 @@ CMake controls options with prefixed `-D`, e.g. `-DopenPMD_USE_MPI=OFF`:
<sup>1</sup> *e.g. changes C++ visibility keywords, breaks MSVC*
<sup>2</sup> *this includes most pre-/post-condition checks, disabling without specific cause is highly discouraged*

Additionally, the following libraries are shipped internally.
The following options allow to switch to external installs:

| CMake Option | Values | Library | Version |
|---------------------------------|------------|---------------|----------|
| `openPMD_USE_INTERNAL_CATCH` | **ON**/OFF | Catch2 | 2.13.10+ |
| `openPMD_USE_INTERNAL_PYBIND11` | **ON**/OFF | pybind11 | 2.11.1+ |
| `openPMD_USE_INTERNAL_JSON` | **ON**/OFF | NLohmann-JSON | 3.9.1+ |
| `openPMD_USE_INTERNAL_TOML11` | **ON**/OFF | toml11 | 3.7.1+ |
Additionally, the following libraries are shipped internally or, if the
corresponding `<PACKAGENAME>_ROOT` variable is provided, can be provided externally:
* [Catch2](https://github.com/catchorg/Catch2) (2.13.10+)
* [PyBind11](https://github.com/pybind/pybind11) (2.11.1+)
* [NLohmann-JSON](https://github.com/nlohmann/json) (3.9.1+)
* [toml11](https://github.com/ToruNiina/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.
Expand Down

0 comments on commit 0e624d4

Please sign in to comment.