File tree Expand file tree Collapse file tree 2 files changed +9
-13
lines changed Expand file tree Collapse file tree 2 files changed +9
-13
lines changed Original file line number Diff line number Diff line change @@ -22,17 +22,13 @@ RUN apt-get update && apt-get install -y autoconf automake \
22
22
libgflags-dev libgoogle-glog-dev libssl-dev \
23
23
protobuf-compiler libtool wget default-jre icu-devtools
24
24
25
- RUN apt-get install -y libgtest-dev && \
26
- cd /usr/src/googletest/googletest && \
27
- mkdir build && \
28
- cd build && \
29
- cmake .. && \
30
- make && \
31
- mkdir /usr/local/lib/googletest && \
32
- ln -sn /usr/local/lib/googletest/libgtest.a /usr/lib/libgtest.a && \
33
- ln -sn /usr/local/lib/googletest/libgtest_main.a /usr/lib/libgtest_main.a && \
34
- rm /lib/x86_64-linux-gnu/libgtest.a && \
35
- ln -sn /usr/local/lib/googletest/libgtest.a /lib/x86_64-linux-gnu/libgtest.a
25
+ RUN git clone --depth 1 https://github.com/google/googletest && \
26
+ cd $SRC/googletest && \
27
+ mkdir build && \
28
+ cd build && \
29
+ cmake .. && \
30
+ make -j$(nproc) && \
31
+ make install
36
32
RUN wget https://github.com/unicode-org/icu/releases/download/release-66-rc/icu4c-66rc-src.tgz && \
37
33
tar xzvf icu4c-66rc-src.tgz
38
34
RUN git clone https://github.com/google/protobuf.git && \
Original file line number Diff line number Diff line change 15
15
#
16
16
# ###############################################################################
17
17
18
- export CXXFLAGS=" $CXXFLAGS -std=c++14 "
18
+ export CXXFLAGS=" $CXXFLAGS -std=c++17 "
19
19
20
20
# For coverage build we need to remove some flags when building protobuf and icu
21
21
if [ " $SANITIZER " = " coverage" ]
69
69
# Build libphonenumber
70
70
cd $SRC /libphonenumber/cpp
71
71
sed -i ' s/set (BUILD_SHARED_LIB true)/set (BUILD_SHARED_LIB false)/g' CMakeLists.txt
72
- sed -i ' s/set(CMAKE_CXX_STANDARD 11/set(CMAKE_CXX_STANDARD 14 /g' CMakeLists.txt
72
+ sed -i ' s/set(CMAKE_CXX_STANDARD 11/set(CMAKE_CXX_STANDARD 17 /g' CMakeLists.txt
73
73
sed -i ' s/list (APPEND CMAKE_C_FLAGS "-pthread")/string (APPEND CMAKE_C_FLAGS " -pthread")/g' CMakeLists.txt
74
74
sed -i ' s/# Safeguarding/find_package(absl REQUIRED) # Safeguarding/g' CMakeLists.txt
75
75
You can’t perform that action at this time.
0 commit comments