From 040dd55f7d8cdd490e19f41cbb0e94c4fdfd96f6 Mon Sep 17 00:00:00 2001 From: Sebastian Brommer Date: Tue, 23 Jul 2024 16:23:53 +0200 Subject: [PATCH] set C++ 17 and add fmtlib to test container --- cmake/AddRoot.cmake | 4 ++-- docker/Dockerfile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmake/AddRoot.cmake b/cmake/AddRoot.cmake index f9fca1c3..df658d03 100644 --- a/cmake/AddRoot.cmake +++ b/cmake/AddRoot.cmake @@ -20,6 +20,6 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL GNU) message(STATUS "Attach -fconcepts to the compiler flags to silence warnings.") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fconcepts") endif() -# require the C++ standard 20 and don't want to fall back to lower +# require the C++ standard 17 and don't want to fall back to lower set(CMAKE_CXX_STANDARD_REQUIRED ON) -set(CMAKE_CXX_STANDARD 20) +set(CMAKE_CXX_STANDARD 17) diff --git a/docker/Dockerfile b/docker/Dockerfile index c1ac6825..ac781970 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -3,7 +3,7 @@ FROM rootproject/root:6.30.04-ubuntu22.04 # Install necessary packages RUN apt-get update -y -RUN apt-get install -y ca-certificates gpg wget git make python3-pip openmpi-bin libopenmpi-dev libboost-all-dev openssh-client nlohmann-json3-dev +RUN apt-get install -y ca-certificates gpg wget git make python3-pip libfmt-dev openmpi-bin libopenmpi-dev libboost-all-dev openssh-client nlohmann-json3-dev RUN python3 -m pip install GitPython && python3 -m pip install git+https://github.com/cms-nanoAOD/correctionlib.git @@ -20,4 +20,4 @@ RUN cd onnxruntime && ./build.sh --config Release --update --build --build_share # Install tini RUN apt-get install -y tini -ENTRYPOINT ["/usr/bin/tini", "--"] \ No newline at end of file +ENTRYPOINT ["/usr/bin/tini", "--"]