Skip to content

Commit 8edcc56

Browse files
committed
Update googletest version to one used in protobuf v29.5
Signed-off-by: Lacewell, Chaunte W <[email protected]>
1 parent 50877b2 commit 8edcc56

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

.github/scripts/setup_vdms.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ 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="v1.17.0"
197+
GOOGLETEST_VERSION="4c9a3bb62bf3ba1f1010bf96f9c8ed767b363774"
198198
LIBEDIT_VERSION="20230828-3.1"
199199
NUMPY_MIN_VERSION="1.26.0"
200200
OPENCV_VERSION="4.9.0"
@@ -215,8 +215,9 @@ make install
215215
216216
217217
# GOOGLETEST
218-
git clone -b "${GOOGLETEST_VERSION}" https://github.com/google/googletest.git $VDMS_DEP_DIR/googletest
218+
git clone https://github.com/google/googletest.git $VDMS_DEP_DIR/googletest
219219
cd $VDMS_DEP_DIR/googletest
220+
git checkout "${GOOGLETEST_VERSION}"
220221
mkdir build && cd build/
221222
cmake -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_BUILD_TYPE=Release \
222223
-DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX=/usr/local \

docs/Install.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -105,12 +105,13 @@ sudo make install
105105
```
106106
<br>
107107

108-
#### **GoogleTest v1.17.0**
109-
Install GoogleTest v1.17.0:
108+
#### **GoogleTest**
109+
Install GoogleTest version used in Protobuf v29.5:
110110
```bash
111-
GOOGLETEST_VERSION="v1.17.0"
112-
git clone -b "${GOOGLETEST_VERSION}" https://github.com/google/googletest.git $VDMS_DEP_DIR/googletest && \
111+
GOOGLETEST_VERSION="4c9a3bb62bf3ba1f1010bf96f9c8ed767b363774"
112+
git clone https://github.com/google/googletest.git $VDMS_DEP_DIR/googletest && \
113113
cd $VDMS_DEP_DIR/googletest
114+
git checkout "${GOOGLETEST_VERSION}"
114115
mkdir build && cd build/
115116
cmake -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_BUILD_TYPE=Release \
116117
-DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX=/usr/local \
@@ -124,7 +125,7 @@ sudo make install
124125
Install Protobuf (C++ and Python) with its dependencies.
125126
```bash
126127
PROTOBUF_VERSION="29.5"
127-
python3 -m pip install --no-cache-dir "protobuf==4.${PROTOBUF_VERSION}"
128+
python3 -m pip install --no-cache-dir "protobuf==5.${PROTOBUF_VERSION}"
128129

129130
git clone -b v${PROTOBUF_VERSION} --recurse-submodules https://github.com/protocolbuffers/protobuf.git $VDMS_DEP_DIR/protobuf
130131
cd $VDMS_DEP_DIR/protobuf

0 commit comments

Comments
 (0)