Merge pull request #721 from shymega/enhance/make-gtest-submodule

Proposal: Replace bundled gtest directory with Git submodule
debauchee · Jun 8, 2020 · 00f2b1f · 00f2b1f
2 parents c336cfd + b16ad17
commit 00f2b1f
Show file tree

Hide file tree

Showing 276 changed files with 14 additions and 256,592 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,6 @@
+[submodule "ext/gtest"]
+	path = ext/gtest
+	url = https://github.com/google/googletest.git
+[submodule "ext/gmock"]
+	path = ext/gmock
+	url = https://github.com/google/googlemock.git
diff --git a/clean_build.bat b/clean_build.bat
@@ -33,6 +33,8 @@ set B_QT_FULLPATH=%B_QT_ROOT%\%B_QT_VER%\%B_QT_MSVC%
 echo Bonjour: %BONJOUR_SDK_HOME%
 echo Qt: %B_QT_FULLPATH%
 
+git submodule update --init --recursive
+
 rmdir /q /s build
 mkdir build
 if ERRORLEVEL 1 goto failed

diff --git a/clean_build.sh b/clean_build.sh
@@ -18,6 +18,10 @@ if [ "$(uname)" = "Darwin" ]; then
 fi
 # allow local customizations to build environment
 [ -r ./build_env.sh ] && . ./build_env.sh
+
+# Initialise Git submodules
+git submodule update --init --recursive
+
 B_CMAKE_FLAGS="-DCMAKE_BUILD_TYPE=$B_BUILD_TYPE $B_CMAKE_FLAGS"
 rm -rf build
 mkdir build || exit 1

diff --git a/ext/gmock b/ext/gmock
diff --git a/ext/gmock/CHANGES b/ext/gmock/CHANGES
diff --git a/ext/gmock/CMakeLists.txt b/ext/gmock/CMakeLists.txt
diff --git a/ext/gmock/CONTRIBUTORS b/ext/gmock/CONTRIBUTORS
diff --git a/ext/gmock/COPYING b/ext/gmock/COPYING