Skip to content

Commit

Permalink
Use the googletest releases from github instead
Browse files Browse the repository at this point in the history
  • Loading branch information
Toon Schoenmakers committed Sep 8, 2016
1 parent e93c024 commit 43c3e76
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions test/.gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
gtest-1.7.0.zip
gtest-1.7.0/
*.o
*.a
test.out
release-1.8.0.tar.gz
googletest-release-1.8.0
8 changes: 4 additions & 4 deletions test/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
COMPILER_FLAGS = -Wall -g -O0 -pipe -std=c++11 -Wno-sign-compare
LINKER_FLAGS =
INC = -I../ -I. -Igtest-1.7.0/include
INC = -I../ -I. -Igoogletest-release-1.8.0/googletest/include
COMPILER = c++
LINKER = c++

Expand All @@ -19,9 +19,9 @@ ${BINARY}: ${DEPS} main.cpp
${LINKER} ${LINKER_FLAGS} ${INC} -o ${BINARY} ${DEPS} libgtest.a -pthread ../libsmarttpl.so

libgtest.a:
wget -q https://googletest.googlecode.com/files/gtest-1.7.0.zip
unzip -qq gtest-1.7.0.zip
${COMPILER} ${COMPILER_FLAGS} -I gtest-1.7.0/include -I gtest-1.7.0 -c gtest-1.7.0/src/gtest-all.cc
wget -q https://github.com/google/googletest/archive/release-1.8.0.tar.gz
tar -xf release-1.8.0.tar.gz
${COMPILER} ${COMPILER_FLAGS} -I googletest-release-1.8.0/googletest/include -I googletest-release-1.8.0/googletest -c googletest-release-1.8.0/googletest/src/gtest-all.cc
ar -rv libgtest.a gtest-all.o

.PHONY: test
Expand Down

0 comments on commit 43c3e76

Please sign in to comment.