File tree Expand file tree Collapse file tree 2 files changed +6
-5
lines changed Expand file tree Collapse file tree 2 files changed +6
-5
lines changed Original file line number Diff line number Diff line change 8282"-Winvalid-pch" ,
8383#"-Wlogical-op", # Useful, but buggy in g++ v 7.
8484#"-Wmismatched-tags", # N/A
85- "-Wmissing-declarations" ,
85+ # "-Wmissing-declarations", # Otherwise protobuf 3.20 complains
8686"-Wmissing-format-attribute" ,
8787"-Wmissing-include-dirs" ,
8888"-Wmultichar" ,
Original file line number Diff line number Diff line change @@ -18,13 +18,14 @@ RUN apt-get -qq update && apt-get -qq upgrade -y && \
1818RUN cd /usr/src/gtest && cmake . && make && mv ./lib/libgtest* /usr/local/lib/
1919
2020# Protobuf
21- RUN wget --no-check-certificate -q https://github.com/protocolbuffers/protobuf/archive/v3.9.0.tar.gz && \
22- tar xf v3.9.0.tar.gz && rm v3.9.0.tar.gz && \
23- cd protobuf-3.9.0 && ./autogen.sh && \
21+ ENV PROTOBUF_VERSION=3.20.0
22+ RUN wget --no-check-certificate -q https://github.com/protocolbuffers/protobuf/archive/v$PROTOBUF_VERSION.tar.gz && \
23+ tar xf v$PROTOBUF_VERSION.tar.gz && rm v$PROTOBUF_VERSION.tar.gz && \
24+ cd protobuf-$PROTOBUF_VERSION && ./autogen.sh && \
2425 ./configure --prefix=/usr/local && \
2526 make -j6 && \
2627 make install && ldconfig && \
27- rm -rf /protobuf-3.9.0
28+ rm -rf /protobuf-$PROTOBUF_VERSION
2829
2930# JSON for Modern C++
3031RUN wget --no-check-certificate -q https://github.com/nlohmann/json/archive/refs/tags/v3.10.2.zip && \
You can’t perform that action at this time.
0 commit comments