shithub: openh264

Info  •  Files  •  Log  •  Branches

Merge pull request #3028 from GuangweiWang/fix-issue-external

replace gtest master branch with a stable branch

--- a/Makefile

+++ b/Makefile

@@ -30,6 +30,7 @@

 PROJECT_NAME=openh264

 MODULE_NAME=gmpopenh264

 GMP_API_BRANCH=Firefox39

+GTEST_VER=release-1.8.1

 CCASFLAGS=$(CFLAGS)

 STATIC_LDFLAGS=-lstdc++

 STRIP ?= strip

@@ -175,7 +176,8 @@

 	cd gmp-api && git fetch origin && git checkout $(GMP_API_BRANCH)

 gtest-bootstrap:

-	if [ ! -d gtest ] ; then git clone https://github.com/google/googletest.git gtest ; fi

+	if [ ! -d gtest ] ; then git clone https://github.com/google/googletest.git gtest && \

+       cd gtest && git checkout -b $(GTEST_VER) $(GTEST_VER) ; fi

 ifeq ($(HAVE_GTEST),Yes)