adam/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-07-30 21:43:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1312 from welwood08/gtest

Browse Source 
Fix `make test` in 1.6.x
This commit is contained in:
Alexey Sokolov
2016-09-04 22:02:43 +01:00
committed by GitHub
parent dd58e369f8 f7d0f0ccb0
commit 14cef81bb5
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile.in
+2 -2
View File
@@ -35,7 +35,7 @@ GTEST_DOWNLOAD :=
GTEST_DIR := @GTEST_DIR@
ifeq "$(GTEST_DIR)" ""
GTEST_VER := 1.7.0
GTEST_DIR := test/gtest-$(GTEST_VER)
GTEST_DIR := test/googletest-release-$(GTEST_VER)
GTEST_DOWNLOAD := 1
endif
@@ -136,7 +136,7 @@ ifneq "$(GTEST_DOWNLOAD)" ""
test/gtest.zip:
@mkdir -p .depend test
$(E) Downloading GoogleTest $(GTEST_VER)
$(Q)wget http://googletest.googlecode.com/files/gtest-$(GTEST_VER).zip -O $@
$(Q)wget https://github.com/google/googletest/archive/release-$(GTEST_VER).zip -O $@
$(GTEST_DIR)/src/gtest-all.cc $(GTEST_DIR)/src/gtest_main.cc $(GTEST_DIR)/include/gtest/gtest.h: test/gtest.zip
$(E) Unpacking GoogleTest $(GTEST_VER)