ref: 22d6a94919e1a4c1b47fa71a9ecff554f343e958
parent: 40e1a69faee04abfd8e55cbe4b9bbd6766728335
parent: 7112938a2857f0326c18a10cc899f581f5b9dae0
author: sijchen <[email protected]>
date: Tue Mar 22 12:20:58 EDT 2016
Merge pull request #2414 from ksb2go/master Google has deprecated using SVN. Move over to GitHub
--- a/Makefile
+++ b/Makefile
@@ -119,11 +119,11 @@
-I$(SRC_PATH)codec/processing/src/vaacalc
GTEST_INCLUDES += \
- -I$(SRC_PATH)gtest \
- -I$(SRC_PATH)gtest/include
+ -I$(SRC_PATH)gtest/googletest \
+ -I$(SRC_PATH)gtest/googletest/include
CODEC_UNITTEST_INCLUDES += \
- -I$(SRC_PATH)gtest/include \
+ -I$(SRC_PATH)gtest/googletest/include \
-I$(SRC_PATH)codec/common/inc \
-I$(SRC_PATH)test
@@ -172,7 +172,7 @@
cd gmp-api && git fetch origin && git checkout $(GMP_API_BRANCH)
gtest-bootstrap:
- svn co https://googletest.googlecode.com/svn/trunk/ gtest
+ git clone https://github.com/google/googletest.git gtest
ifeq ($(HAVE_GTEST),Yes)
--- a/build/gtest-targets.mk
+++ b/build/gtest-targets.mk
@@ -1,4 +1,4 @@
-GTEST_SRCDIR=gtest
+GTEST_SRCDIR=gtest/googletest
GTEST_CPP_SRCS=\
$(GTEST_SRCDIR)/src/gtest-all.cc\