Skip to content

Commit 026ea6b

Browse files
Upgrade protobuf to 5.29.5 (#312)
* Upgrade protobuf to 5.29.5 Signed-off-by: Lacewell, Chaunte W <[email protected]> * Change google test version (compatibility issue with v1.17.0) Signed-off-by: Lacewell, Chaunte W <[email protected]> * downgrade google test version to v1.13.0 for neo4j Signed-off-by: Lacewell, Chaunte W <[email protected]> * Revert to googletest commit 4c9a3bb62bf3ba1f1010bf96f9c8ed767b363774 Signed-off-by: Lacewell, Chaunte W <[email protected]> * Automated coverage update * Update googletest version to one used in protobuf v29.5 Signed-off-by: Lacewell, Chaunte W <[email protected]> * Automated coverage update --------- Signed-off-by: Lacewell, Chaunte W <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
1 parent 460b557 commit 026ea6b

File tree

10 files changed

+91
-91
lines changed

10 files changed

+91
-91
lines changed

.github/coverage/cpp.develop.coverage_report.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,12 @@ src/VDMSConfig.cc 230 215 93% 110-111,139-14
5757
src/VideoCommand.cc 469 125 26% 51,54-55,57-59,61,63,66-67,69-70,73,75-77,79-81,83,85-88,90-91,93-94,96,98-100,103,110,112,117,122-125,131,133,159-160,166-167,169,180,183,200,212,216-219,226-228,230-232,238,240-246,248-249,252-254,256-258,260-261,263,265-277,279-281,283-284,295,299,324,328,330,332,334,336,339-340,342,345,349,351,356-357,379-380,382-383,386-391,393,395,397-398,404,406,435,448-453,455-462,466-472,474,479-484,487,489-490,493-495,503,508,526-529,532-536,552,555,557-559,562-564,566-567,569-573,576-577,580-582,584,586-588,591-594,598-603,608-609,611-612,614-618,621-623,625,627-629,631-634,637-638,641,643,648,661,663-670,674,677,680,685-686,688-692,695-696,698,700,702,705,709,711,713-716,718-720,723,725,727,729-730,732-733,737,742,745-746,748-750,752,754,756-758,760-761,764-766,770-773,777-781,785-789,793,796,798,800,802,804-808,812-816,819-820,822-825,828-831,836-837,841-846,850-851,854-855
5858
src/VideoLoop.cc 250 217 86% 33,81,98-101,103-109,180,188,197,201,207,211,217,220,290,312,315,320-321,324-325,327,334-335,354,370
5959
utils/src/comm/ConnClient.cc 69 57 82% 49,55,59-60,98,103,108,114,120,127,130,149
60-
utils/src/comm/Connection.cc 82 62 75% 48-53,75,77-79,84,86,97,111,135,140,153,157,159,168
60+
utils/src/comm/Connection.cc 82 61 74% 48-53,75,77-79,84,86,97,111,135,140,153,157,159,168,172
6161
utils/src/comm/ConnServer.cc 61 49 80% 60,64,68,75,84,91,103,108,128,135,140,145
6262
utils/src/comm/Exception.cc 6 0 0% 35-40
6363
utils/src/kubernetes/KubeHelper.cc 183 37 20% 23-30,32-35,37-49,51-54,56-65,68-79,81-90,96-99,101,103-105,107-110,112-118,120-125,127-143,146-154,156,158-161,163-165,167,177,183,198,204,206-218,231-238
6464
utils/src/stats/SystemStats.cc 250 249 99% 455
6565
utils/src/timers/TimerMap.cc 82 74 90% 126,151,153,155-158,162
6666
------------------------------------------------------------------------------
67-
TOTAL 12491 8508 68%
67+
TOTAL 12491 8507 68%
6868
------------------------------------------------------------------------------
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
68.113
1+
68.105

.github/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ MarkupSafe==3.0.2
1414
numpy==1.26.4
1515
opencv-python-headless==4.11.0.86
1616
pillow==11.1.0
17-
protobuf==4.25.8
17+
protobuf==5.29.5
1818
pycparser==2.22
1919
Pygments==2.19.1
2020
pyzmq==26.4.0

.github/scripts/Dockerfile.checkin

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ ENV DEBIAN_FRONTEND=noninteractive
2121
ENV DEBCONF_NOWARNINGS="yes"
2222
ENV PYTHON_BASE="3.12"
2323
ENV PYTHON_VERSION="${PYTHON_BASE}.3"
24-
ENV PROTOBUF_VERSION="25.8"
24+
ENV PROTOBUF_VERSION="29.5"
2525
ENV NUMPY_MIN_VERSION="1.26.0"
2626
ENV VIRTUAL_ENV=/opt/venv
2727

@@ -77,6 +77,7 @@ ENV AUTOCONF_VERSION="2.71" \
7777
AWS_SDK_VERSION="1.11.336" \
7878
CMAKE_VERSION="v3.28.5" \
7979
FAISS_VERSION="v1.9.0" \
80+
GOOGLETEST_VERSION="4c9a3bb62bf3ba1f1010bf96f9c8ed767b363774" \
8081
LIBEDIT_VERSION="20230828-3.1" \
8182
OPENCV_VERSION="4.9.0" \
8283
PEG_VERSION="0.1.19" \
@@ -89,27 +90,25 @@ RUN git clone --branch ${CMAKE_VERSION} https://github.com/Kitware/CMake.git /de
8990
cd /dependencies/CMake && ./bootstrap && make ${BUILD_THREADS} && \
9091
make install DESTDIR=/opt/dist && make install
9192

93+
# GOOGLETEST
94+
# hadolint ignore=DL3003,SC2086
95+
RUN git clone https://github.com/google/googletest.git /dependencies/googletest && \
96+
cd /dependencies/googletest && git checkout "${GOOGLETEST_VERSION}" && \
97+
mkdir build && cd build/ && \
98+
cmake -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_BUILD_TYPE=Release \
99+
-DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX=/opt/dist/usr/local \
100+
-DBUILD_GMOCK=ON -DCMAKE_CXX_STANDARD=17 .. && \
101+
make ${BUILD_THREADS} && make install
102+
92103
# PROTOBUF & ITS DEPENDENCIES
93104
# hadolint ignore=DL3003,SC2086
94105
RUN git clone -b "v${PROTOBUF_VERSION}" --recurse-submodules https://github.com/protocolbuffers/protobuf.git /dependencies/protobuf && \
95-
cd /dependencies/protobuf/third_party/googletest && mkdir build && cd build/ && \
96-
cmake -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_BUILD_TYPE=Release \
97-
-DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX=/opt/dist/usr/local \
98-
-DBUILD_GMOCK=ON -DCMAKE_CXX_STANDARD=17 .. && \
99-
make ${BUILD_THREADS} && make install && \
100-
cd /dependencies/protobuf/third_party/abseil-cpp && mkdir build && cd build && \
101-
cmake -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DBUILD_SHARED_LIBS=ON \
102-
-DCMAKE_INSTALL_PREFIX=/opt/dist/usr/local -DABSL_BUILD_TESTING=ON \
103-
-DABSL_USE_EXTERNAL_GOOGLETEST=ON \
104-
-DABSL_FIND_GOOGLETEST=ON -DCMAKE_CXX_STANDARD=17 .. && \
105-
make ${BUILD_THREADS} && make install && ldconfig /opt/dist/usr/local/lib && \
106106
cd /dependencies/protobuf && \
107-
cmake -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_INSTALL_PREFIX=/opt/dist/usr/local \
108-
-DCMAKE_CXX_STANDARD=17 -Dprotobuf_BUILD_SHARED_LIBS=ON \
109-
-Dprotobuf_ABSL_PROVIDER=package \
110-
-Dprotobuf_BUILD_TESTS=ON \
111-
-Dabsl_DIR=/opt/dist/usr/local/lib/cmake/absl . && \
112-
make ${BUILD_THREADS} && make install
107+
cmake -Dprotobuf_FORCE_FETCH_DEPENDENCIES=ON \
108+
-DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_INSTALL_PREFIX=/opt/dist/usr/local \
109+
-DCMAKE_CXX_STANDARD=17 -Dprotobuf_BUILD_SHARED_LIBS=ON \
110+
-Dprotobuf_BUILD_TESTS=ON . && \
111+
make ${BUILD_THREADS} && make install
113112

114113
# OPENCV
115114
# hadolint ignore=DL3003,SC2086
@@ -150,8 +149,8 @@ RUN curl -L -O https://github.com/TileDB-Inc/TileDB/archive/refs/tags/${TILEDB_V
150149

151150
# AUTOCONF VERSION FOR NEO4J
152151
# hadolint ignore=DL3003,SC2086
153-
RUN curl -O https://ftp.gnu.org/gnu/autoconf/autoconf-${AUTOCONF_VERSION}.tar.xz && \
154-
tar -xf autoconf-${AUTOCONF_VERSION}.tar.xz && cd autoconf-${AUTOCONF_VERSION} && \
152+
RUN curl -L -O http://ftpmirror.gnu.org/autoconf/autoconf-${AUTOCONF_VERSION}.tar.gz && \
153+
tar -xzf autoconf-${AUTOCONF_VERSION}.tar.gz && cd autoconf-${AUTOCONF_VERSION} && \
155154
./configure && make ${BUILD_THREADS} && make install DESTDIR=/opt/dist && make install
156155

157156
# LIB-OMNI FOR NEO4J QUERY HANDLER
@@ -253,7 +252,7 @@ RUN apt-get update -y && apt-get upgrade -y && \
253252
apt-get --purge remove -y python3.11 && apt-get autoremove -y && \
254253
apt-get clean && rm -rf /var/lib/apt/lists/* && \
255254
echo "/usr/local/lib" >> /etc/ld.so.conf.d/all-libs.conf && ldconfig && \
256-
python3 -m pip install --no-cache-dir "numpy>=${NUMPY_MIN_VERSION},<2.0.0" "protobuf==4.${PROTOBUF_VERSION}" \
255+
python3 -m pip install --no-cache-dir "numpy>=${NUMPY_MIN_VERSION},<2.0.0" "protobuf==5.${PROTOBUF_VERSION}" \
257256
"coverage>=7.3.1" "cryptography>=44.0.1"
258257

259258
# COVERAGE TESTING

.github/scripts/setup_vdms.sh

Lines changed: 13 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ export PATH="$VIRTUAL_ENV/bin:$PATH"
176176
177177
if [ "${BUILD_COVERAGE}" = "ON" ]; then
178178
apt-get install -y --no-install-suggests --no-install-recommends gdb
179-
python -m pip install --no-cache-dir "gcovr>=7.0"
179+
python -m pip install --no-cache-dir "gcovr==8.4"
180180
curl -L -o ${WORKSPACE}/minio https://dl.min.io/server/minio/release/linux-amd64/minio
181181
chmod +x ${WORKSPACE}/minio
182182
mkdir -p ${WORKSPACE}/minio_files/minio-bucket
@@ -194,11 +194,12 @@ AUTOCONF_VERSION="2.71"
194194
AWS_SDK_VERSION="1.11.336"
195195
CMAKE_VERSION="v3.28.5"
196196
FAISS_VERSION="v1.9.0"
197+
GOOGLETEST_VERSION="4c9a3bb62bf3ba1f1010bf96f9c8ed767b363774"
197198
LIBEDIT_VERSION="20230828-3.1"
198199
NUMPY_MIN_VERSION="1.26.0"
199200
OPENCV_VERSION="4.9.0"
200201
PEG_VERSION="0.1.19"
201-
PROTOBUF_VERSION="25.8"
202+
PROTOBUF_VERSION="29.5"
202203
TILEDB_VERSION="2.14.1"
203204
VALIJSON_VERSION="v0.6"
204205
@@ -213,32 +214,25 @@ make ${BUILD_THREADS}
213214
make install
214215
215216
216-
# INSTALL PROTOBUF & ITS DEPENDENCIES
217-
git clone -b "v${PROTOBUF_VERSION}" --recurse-submodules https://github.com/protocolbuffers/protobuf.git $VDMS_DEP_DIR/protobuf
218-
cd $VDMS_DEP_DIR/protobuf/third_party/googletest
217+
# GOOGLETEST
218+
git clone https://github.com/google/googletest.git $VDMS_DEP_DIR/googletest
219+
cd $VDMS_DEP_DIR/googletest
220+
git checkout "${GOOGLETEST_VERSION}"
219221
mkdir build && cd build/
220222
cmake -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_BUILD_TYPE=Release \
221223
-DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX=/usr/local \
222224
-DBUILD_GMOCK=ON -DCMAKE_CXX_STANDARD=17 ..
223225
make ${BUILD_THREADS}
224226
make install
225227
226-
cd $VDMS_DEP_DIR/protobuf/third_party/abseil-cpp
227-
mkdir build && cd build
228-
cmake -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DBUILD_SHARED_LIBS=ON \
229-
-DCMAKE_INSTALL_PREFIX=/usr/local -DABSL_BUILD_TESTING=ON \
230-
-DABSL_USE_EXTERNAL_GOOGLETEST=ON \
231-
-DABSL_FIND_GOOGLETEST=ON -DCMAKE_CXX_STANDARD=17 ..
232-
make ${BUILD_THREADS}
233-
make install
234-
ldconfig /usr/local/lib
235228
229+
# INSTALL PROTOBUF & ITS DEPENDENCIES
230+
git clone -b "v${PROTOBUF_VERSION}" --recurse-submodules https://github.com/protocolbuffers/protobuf.git $VDMS_DEP_DIR/protobuf
236231
cd $VDMS_DEP_DIR/protobuf
237-
cmake -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_INSTALL_PREFIX=/usr/local \
232+
cmake -Dprotobuf_FORCE_FETCH_DEPENDENCIES=ON \
233+
-DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_INSTALL_PREFIX=/usr/local \
238234
-DCMAKE_CXX_STANDARD=17 -Dprotobuf_BUILD_SHARED_LIBS=ON \
239-
-Dprotobuf_ABSL_PROVIDER=package \
240-
-Dprotobuf_BUILD_TESTS=ON \
241-
-Dabsl_DIR=/usr/local/lib/cmake/absl .
235+
-Dprotobuf_BUILD_TESTS=ON .
242236
make ${BUILD_THREADS}
243237
make install
244238
@@ -255,7 +249,7 @@ make install
255249
256250
# INSTALL PYTHON PACKAGES
257251
python -m pip install --no-cache-dir "numpy>=${NUMPY_MIN_VERSION},<2.0.0" "coverage>=7.3.1" \
258-
"protobuf==4.${PROTOBUF_VERSION}" "cryptography>=44.0.1"
252+
"protobuf==5.${PROTOBUF_VERSION}" "cryptography>=44.0.1"
259253
260254
261255
# INSTALL VALIJSON

client/python/setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55

66
setuptools.setup(
77
name="vdms",
8-
version="0.0.21",
8+
version="0.0.22",
99
author="Chaunté W. Lacewell",
1010
author_email="[email protected]",
1111
description="VDMS Client Module",
12-
install_requires=["protobuf==4.25.8"],
12+
install_requires=["protobuf==5.29.5"],
1313
long_description=long_description,
1414
long_description_content_type="text/markdown",
1515
url="https://github.com/IntelLabs/vdms",

client/python/vdms/queryMessage_pb2.py

Lines changed: 13 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docker/base/Dockerfile

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ ENV DEBIAN_FRONTEND=noninteractive
2121
ENV DEBCONF_NOWARNINGS="yes"
2222
ENV PYTHON_BASE="3.12"
2323
ENV PYTHON_VERSION="${PYTHON_BASE}.3"
24-
ENV PROTOBUF_VERSION="25.8"
24+
ENV PROTOBUF_VERSION="29.5"
2525
ENV NUMPY_MIN_VERSION="1.26.0"
2626
ENV VIRTUAL_ENV=/opt/venv
2727

@@ -77,6 +77,7 @@ ENV AUTOCONF_VERSION="2.71" \
7777
AWS_SDK_VERSION="1.11.336" \
7878
CMAKE_VERSION="v3.28.5" \
7979
FAISS_VERSION="v1.9.0" \
80+
GOOGLETEST_VERSION="4c9a3bb62bf3ba1f1010bf96f9c8ed767b363774" \
8081
LIBEDIT_VERSION="20230828-3.1" \
8182
OPENCV_VERSION="4.9.0" \
8283
PEG_VERSION="0.1.19" \
@@ -89,27 +90,25 @@ RUN git clone --branch ${CMAKE_VERSION} https://github.com/Kitware/CMake.git /de
8990
cd /dependencies/CMake && ./bootstrap && make ${BUILD_THREADS} && \
9091
make install DESTDIR=/opt/dist && make install
9192

93+
# GOOGLETEST
94+
# hadolint ignore=DL3003,SC2086
95+
RUN git clone https://github.com/google/googletest.git /dependencies/googletest && \
96+
cd /dependencies/googletest && git checkout "${GOOGLETEST_VERSION}" && \
97+
mkdir build && cd build/ && \
98+
cmake -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_BUILD_TYPE=Release \
99+
-DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX=/opt/dist/usr/local \
100+
-DBUILD_GMOCK=ON -DCMAKE_CXX_STANDARD=17 .. && \
101+
make ${BUILD_THREADS} && make install
102+
92103
# PROTOBUF & ITS DEPENDENCIES
93104
# hadolint ignore=DL3003,SC2086
94105
RUN git clone -b "v${PROTOBUF_VERSION}" --recurse-submodules https://github.com/protocolbuffers/protobuf.git /dependencies/protobuf && \
95-
cd /dependencies/protobuf/third_party/googletest && mkdir build && cd build/ && \
96-
cmake -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_BUILD_TYPE=Release \
97-
-DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX=/opt/dist/usr/local \
98-
-DBUILD_GMOCK=ON -DCMAKE_CXX_STANDARD=17 .. && \
99-
make ${BUILD_THREADS} && make install && \
100-
cd /dependencies/protobuf/third_party/abseil-cpp && mkdir build && cd build && \
101-
cmake -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DBUILD_SHARED_LIBS=ON \
102-
-DCMAKE_INSTALL_PREFIX=/opt/dist/usr/local -DABSL_BUILD_TESTING=ON \
103-
-DABSL_USE_EXTERNAL_GOOGLETEST=ON \
104-
-DABSL_FIND_GOOGLETEST=ON -DCMAKE_CXX_STANDARD=17 .. && \
105-
make ${BUILD_THREADS} && make install && ldconfig /opt/dist/usr/local/lib && \
106106
cd /dependencies/protobuf && \
107-
cmake -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_INSTALL_PREFIX=/opt/dist/usr/local \
108-
-DCMAKE_CXX_STANDARD=17 -Dprotobuf_BUILD_SHARED_LIBS=ON \
109-
-Dprotobuf_ABSL_PROVIDER=package \
110-
-Dprotobuf_BUILD_TESTS=ON \
111-
-Dabsl_DIR=/opt/dist/usr/local/lib/cmake/absl . && \
112-
make ${BUILD_THREADS} && make install
107+
cmake -Dprotobuf_FORCE_FETCH_DEPENDENCIES=ON \
108+
-DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_INSTALL_PREFIX=/opt/dist/usr/local \
109+
-DCMAKE_CXX_STANDARD=17 -Dprotobuf_BUILD_SHARED_LIBS=ON \
110+
-Dprotobuf_BUILD_TESTS=ON . && \
111+
make ${BUILD_THREADS} && make install
113112

114113
# OPENCV
115114
# hadolint ignore=DL3003,SC2086
@@ -150,8 +149,8 @@ RUN curl -L -O https://github.com/TileDB-Inc/TileDB/archive/refs/tags/${TILEDB_V
150149

151150
# AUTOCONF VERSION FOR NEO4J
152151
# hadolint ignore=DL3003,SC2086
153-
RUN curl -O https://ftp.gnu.org/gnu/autoconf/autoconf-${AUTOCONF_VERSION}.tar.xz && \
154-
tar -xf autoconf-${AUTOCONF_VERSION}.tar.xz && cd autoconf-${AUTOCONF_VERSION} && \
152+
RUN curl -L -O http://ftpmirror.gnu.org/autoconf/autoconf-${AUTOCONF_VERSION}.tar.gz && \
153+
tar -xzf autoconf-${AUTOCONF_VERSION}.tar.gz && cd autoconf-${AUTOCONF_VERSION} && \
155154
./configure && make ${BUILD_THREADS} && make install DESTDIR=/opt/dist && make install
156155

157156
# LIB-OMNI FOR NEO4J QUERY HANDLER
@@ -227,7 +226,7 @@ RUN apt-get update -y && apt-get upgrade -y && \
227226
apt-get --purge remove -y python3.11 && apt-get autoremove -y && \
228227
apt-get clean && rm -rf /var/lib/apt/lists/* && \
229228
echo "/usr/local/lib" >> /etc/ld.so.conf.d/all-libs.conf && ldconfig && \
230-
python3 -m pip install --no-cache-dir "numpy>=${NUMPY_MIN_VERSION},<2.0.0" "protobuf==4.${PROTOBUF_VERSION}" \
229+
python3 -m pip install --no-cache-dir "numpy>=${NUMPY_MIN_VERSION},<2.0.0" "protobuf==5.${PROTOBUF_VERSION}" \
231230
"coverage>=7.3.1" "cryptography>=44.0.1"
232231

233232
# VDMS

docs/Install.md

Lines changed: 18 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -105,38 +105,34 @@ sudo make install
105105
```
106106
<br>
107107

108-
#### **Protobuf v25.8 (4.25.8)**
109-
Install Protobuf (C++ and Python) which requires GoogleTest and Abseil C++ as dependencies.
108+
#### **GoogleTest**
109+
Install GoogleTest version used in Protobuf v29.5:
110110
```bash
111-
PROTOBUF_VERSION="25.8"
112-
python3 -m pip install --no-cache-dir "protobuf==4.${PROTOBUF_VERSION}"
113-
114-
git clone -b v${PROTOBUF_VERSION} --recurse-submodules https://github.com/protocolbuffers/protobuf.git $VDMS_DEP_DIR/protobuf
115-
116-
cd $VDMS_DEP_DIR/protobuf/third_party/googletest
117-
mkdir build && cd build
111+
GOOGLETEST_VERSION="4c9a3bb62bf3ba1f1010bf96f9c8ed767b363774"
112+
git clone https://github.com/google/googletest.git $VDMS_DEP_DIR/googletest && \
113+
cd $VDMS_DEP_DIR/googletest
114+
git checkout "${GOOGLETEST_VERSION}"
115+
mkdir build && cd build/
118116
cmake -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_BUILD_TYPE=Release \
119117
-DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX=/usr/local \
120118
-DBUILD_GMOCK=ON -DCMAKE_CXX_STANDARD=17 ..
121119
make ${BUILD_THREADS}
122120
sudo make install
121+
```
122+
<br>
123123

124-
cd $VDMS_DEP_DIR/protobuf/third_party/abseil-cpp
125-
mkdir build && cd build
126-
cmake -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DBUILD_SHARED_LIBS=ON \
127-
-DCMAKE_INSTALL_PREFIX=/usr/local -DABSL_BUILD_TESTING=ON \
128-
-DABSL_USE_EXTERNAL_GOOGLETEST=ON \
129-
-DABSL_FIND_GOOGLETEST=ON -DCMAKE_CXX_STANDARD=17 ..
130-
make ${BUILD_THREADS}
131-
sudo make install
132-
sudo ldconfig /usr/local/lib
124+
#### **Protobuf v29.5 (5.29.5)**
125+
Install Protobuf (C++ and Python) with its dependencies.
126+
```bash
127+
PROTOBUF_VERSION="29.5"
128+
python3 -m pip install --no-cache-dir "protobuf==5.${PROTOBUF_VERSION}"
133129

130+
git clone -b v${PROTOBUF_VERSION} --recurse-submodules https://github.com/protocolbuffers/protobuf.git $VDMS_DEP_DIR/protobuf
134131
cd $VDMS_DEP_DIR/protobuf
135-
cmake -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_INSTALL_PREFIX=/usr/local \
132+
cmake -Dprotobuf_FORCE_FETCH_DEPENDENCIES=ON \
133+
-DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_INSTALL_PREFIX=/usr/local \
136134
-DCMAKE_CXX_STANDARD=17 -Dprotobuf_BUILD_SHARED_LIBS=ON \
137-
-Dprotobuf_ABSL_PROVIDER=package \
138-
-Dprotobuf_BUILD_TESTS=ON \
139-
-Dabsl_DIR=/usr/local/lib/cmake/absl .
135+
-Dprotobuf_BUILD_TESTS=ON .
140136
make ${BUILD_THREADS}
141137
sudo make install
142138
```

tests/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,5 +93,6 @@ target_link_libraries(unit_tests
9393
${OpenCV_LIBS}
9494
${AWSSDK_LINK_LIBRARIES}
9595
neo4j-client
96+
-lgtest
9697
)
9798

0 commit comments

Comments
 (0)