gitMirror/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1011 from zeitounator/wrong-version-reported

Browse Source 
Wrong version reported (1.7.0 should be 1.8.0)
This commit is contained in:
Gennadiy Civil
2017-09-01 13:38:26 -04:00
committed by GitHub
parent b3a1f87f0c 96f7ba83cb
commit e4f6c0b358
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
googlemock/configure.ac
View File

@@ -1,7 +1,7 @@
m4_include(../googletest/m4/acx_pthread.m4) m4_include(../googletest/m4/acx_pthread.m4)
AC_INIT([Google C++ Mocking Framework], AC_INIT([Google C++ Mocking Framework],
[1.7.0], [1.8.0],
[googlemock@googlegroups.com], [googlemock@googlegroups.com],
[gmock]) [gmock])
@@ -101,7 +101,7 @@ AC_ARG_VAR([GTEST_VERSION],
[The version of Google Test available.]) [The version of Google Test available.])
HAVE_BUILT_GTEST="no" HAVE_BUILT_GTEST="no"
GTEST_MIN_VERSION="1.7.0" GTEST_MIN_VERSION="1.8.0"
AS_IF([test "x${enable_external_gtest}" = "xyes"], AS_IF([test "x${enable_external_gtest}" = "xyes"],
[# Begin filling in variables as we are able. [# Begin filling in variables as we are able.

2
googletest/configure.ac
View File

@@ -5,7 +5,7 @@ m4_include(m4/acx_pthread.m4)
# "[1.0.1]"). It also asumes that there won't be any closing parenthesis # "[1.0.1]"). It also asumes that there won't be any closing parenthesis
# between "AC_INIT(" and the closing ")" including comments and strings. # between "AC_INIT(" and the closing ")" including comments and strings.
AC_INIT([Google C++ Testing Framework], AC_INIT([Google C++ Testing Framework],
[1.7.0], [1.8.0],
[googletestframework@googlegroups.com], [googletestframework@googlegroups.com],
[gtest]) [gtest])