Change gtest download branch

- Branch 'main' instead of 'master'.
gabyx · Nov 18, 2021 · 838f3ff · 838f3ff
1 parent 58892b8
commit 838f3ff
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.githooks/pre-commit/update-version b/.githooks/pre-commit/update-version
@@ -1,4 +1,4 @@
 #!/bin/bash
 echo "Updating version"
 rootDir=$(git rev-parse --show-toplevel) || exit 1
-git describe --tags --abbrev=1 >"$rootDir/VERSION" || exit 1
+git describe --tags --abbrev=0 >"$rootDir/VERSION" || exit 1
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-v2.1.3-4-g7d9c
+v2.1.3
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -2,7 +2,7 @@
 include(DownloadProject)
 download_project(PROJ                googletest
                  GIT_REPOSITORY      https://github.com/google/googletest.git
-                 GIT_TAG             master
+                 GIT_TAG             main
                  UPDATE_DISCONNECTED 1
 )
 
@@ -64,7 +64,7 @@ macro(defineTarget TARGETNAME)
 
     setTargetCompileOptions(${TARGETNAME})
 
-    if( CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR 
+    if( CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR
         CMAKE_CXX_COMPILER_ID MATCHES "Clang")
         target_compile_options(${TARGETNAME} PRIVATE -DApproxMVBB_BUILD_TESTS )
     elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")