Skip to content

Commit ddd929a

Browse files
committed
Set C++ 20 dialect in Conan profile
1 parent ae12cdc commit ddd929a

File tree

3 files changed

+12
-0
lines changed

3 files changed

+12
-0
lines changed

docker/debian/Dockerfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,8 @@ WORKDIR /home/${NONROOT_USER}
9191

9292
# Create a default Conan profile.
9393
RUN conan profile detect
94+
# Fix the C++ dialect.
95+
RUN sed -e 's|^compiler\.cppstd=.*$|compiler.cppstd=20|' ${CONAN_HOME}/profiles/default
9496
# Print the Conan profile to verify the configuration.
9597
RUN conan profile show
9698

@@ -135,5 +137,7 @@ tools.build:cxxflags=['-Wno-missing-template-arg-list-after-template-kw']
135137
EOT
136138
fi
137139
EOF
140+
# Fix the C++ dialect.
141+
RUN sed -e 's|^compiler\.cppstd=.*$|compiler.cppstd=20|' ${CONAN_HOME}/profiles/default
138142
# Print the Conan profile to verify the configuration.
139143
RUN conan profile show

docker/rhel/Dockerfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@ ENV CONAN_HOME=/home/${NONROOT_USER}/.conan2
5151

5252
# Create a default Conan profile.
5353
RUN conan profile detect
54+
# Fix the C++ dialect.
55+
RUN sed -e 's|^compiler\.cppstd=.*$|compiler.cppstd=20|' ${CONAN_HOME}/profiles/default
5456
# Print the Conan profile to verify the configuration.
5557
RUN conan profile show
5658

@@ -87,5 +89,7 @@ tools.build:cxxflags=['-Wno-missing-template-arg-list-after-template-kw']
8789
EOT
8890
fi
8991
EOF
92+
# Fix the C++ dialect.
93+
RUN sed -e 's|^compiler\.cppstd=.*$|compiler.cppstd=20|' ${CONAN_HOME}/profiles/default
9094
# Print the Conan profile to verify the configuration.
9195
RUN conan profile show

docker/ubuntu/Dockerfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,8 @@ WORKDIR /home/${NONROOT_USER}
6363

6464
# Create a default Conan profile.
6565
RUN conan profile detect
66+
# Fix the C++ dialect.
67+
RUN sed -e 's|^compiler\.cppstd=.*$|compiler.cppstd=20|' ${CONAN_HOME}/profiles/default
6668
# Print the Conan profile to verify the configuration.
6769
RUN conan profile show
6870

@@ -98,5 +100,7 @@ tools.build:cxxflags=['-Wno-missing-template-arg-list-after-template-kw']
98100
EOT
99101
fi
100102
EOF
103+
# Fix the C++ dialect.
104+
RUN sed -e 's|^compiler\.cppstd=.*$|compiler.cppstd=20|' ${CONAN_HOME}/profiles/default
101105
# Print the Conan profile to verify the configuration.
102106
RUN conan profile show

0 commit comments

Comments
 (0)