The TS-GitLab will have to shut down in the near future — please plan migrating your projects to GitLab.com or GitHub. Contact @yunus for more information.

Commit 1ccc986e authored by Lukas Riedel's avatar Lukas Riedel 🎧 Committed by Santiago Ospina De Los Ríos
Browse files

Update C++ standard requirement

* Explicitly sets the C++ standard version for the compiled DORiE libraries and document the standard we use.
parent bd8935cb
......@@ -25,6 +25,7 @@
* Compiler warnings for unused variables in `dune/dorie/common/h5file.hh` !206
* Ensure UTF-8 locale definition in Docker images !210
* `grid.extensions` values were erroneously read when loading GMSH grids #193
* Compiling failed on macOS because C++11 was selected as standard #198
## 2.0.0 (2020-05-14)
......
......@@ -35,7 +35,6 @@ include(DuneMacros)
# start a dune project with information from dune.module
dune_project()
dune_enable_all_packages()
dune_require_cxx_standard(MODULE "dorie" VERSION 14)
# Cache the executable path
set(DORIE_EXE_PATH ${PROJECT_BINARY_DIR}/dune/dorie/
......
......@@ -139,7 +139,9 @@ by CI tests.
| Software | Version/Branch | Comments |
| ---------| -------------- | -------- |
| CMake | 3.16 |
| GCC | 9.3 | Alternatively: LLVM Clang 10, or Apple Clang 11
| GCC | 9.3 | Full C++17 support required
| *or* LLVM Clang | 10 | Full C++17 support required
| *or* AppleClang | 11 | Full C++17 support required
| git |
| pkg-config |
| FFTW3 | 3.3.8 | MPI support required
......
......@@ -94,6 +94,9 @@ function(dorie_compile_instance)
${DUNE_LIBS}
)
# Set the C++ standard as compile feature
target_compile_features(${lib_name} PUBLIC cxx_std_17)
# register the executable
set(exe_name "${ARGS_MODEL}_${DIM_STR}_${OPTION_STR}")
set(src_file ${CMAKE_SOURCE_DIR}/dune/dorie/${ARGS_MODEL}.cc)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment