Merge pull request #953 from plumed/c++17

C++17
plumed · Sep 5, 2023 · 943108b · 943108b · PlumedBot · Sep 5, 2023
2 parents 544dd90 + 610f86b
commit 943108b
Show file tree

Hide file tree

Showing 43 changed files with 1,078 additions and 1,912 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -33,4 +33,4 @@ jobs:
 
   conda:
     uses: ./.github/workflows/condaWF.yml
-    secrets: inherit
+    secrets: inherit
diff --git a/.github/workflows/dockerWF.yml b/.github/workflows/dockerWF.yml
@@ -19,11 +19,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # centos7 (gcc 4.8)
         # fedora38 (gcc 13)
         # rockylinux8
         variant:
-        - centos7
         - fedora38
         - rocky8
     steps:

diff --git a/CHANGES/v2.10.md b/CHANGES/v2.10.md
@@ -4,5 +4,7 @@
 
 This page contains changes that will end up in 2.10
 
+- **PLUMED 2.10 requires a C++17 compatible compiler**.
+
 - Changes relevant for developers:
-  - Removed some shortcuts for `ActionRegister.h` (from the modules bias colvar function sasa and vatom) and `CLToolRegister.h` (from the module cltools), now the two headers can only be included with `#include "core/ActionRegister.h"` or `#include "core/CLToolRegister.h"`.
+  - Removed some shortcuts for `ActionRegister.h` (from the modules bias colvar function sasa and vatom) and `CLToolRegister.h` (from the module cltools), now the two headers can only be included with `#include "core/ActionRegister.h"` or `#include "core/CLToolRegister.h"`.
diff --git a/README.md b/README.md
@@ -92,9 +92,8 @@ Required software
 Required software:
 
 * GNU make.
-* C/c++ compiler (c++11 support is required as of version 2.4).
+* C/c++ compiler (c++17 support is required as of version 2.10).
 * A modern version of the `patch` command line tool.
-* Support for POSIX library `dirent.h`.
 
 Suggested software (libraries are checked by `./configure` and enabled if available):
 

diff --git a/conda/plumed/build.sh b/conda/plumed/build.sh
@@ -16,6 +16,11 @@ export CPPFLAGS="-D__PLUMED_DEFAULT_KERNEL=$PREFIX/lib/libplumedKernel$SHLIB_EXT
 # enable optimization
 export CXXFLAGS="${CXXFLAGS//-O2/-O3}"
 
+if [[ $(uname) == "Darwin" ]]; then
+# see https://conda-forge.org/docs/maintainer/knowledge_base.html#newer-c-features-with-old-sdk
+  CXXFLAGS="${CXXFLAGS} -D_LIBCPP_DISABLE_AVAILABILITY"
+fi
+
 # libraries are explicitly listed here due to --disable-libsearch
 export LIBS="-lfftw3 -lgsl -lgslcblas -llapack -lblas -lz $LIBS"