Merge pull request #773 from mazong1123/master
0a439623f75c
Actions

Authored by Billy Donahue <BillyDonahue@users.noreply.github.com> on May 15 2016, 18:20.

Description

Merge pull request #773 from mazong1123/master

Fixed googletest dir issue for building googlemock.

Committed

Billy Donahue <BillyDonahue@users.noreply.github.com>

May 15 2016, 18:20

Pushed

• trottet

Dec 4 2019, 13:52

Parents

Branches

Unknown

Tags

Unknown

Billy Donahue <BillyDonahue@users.noreply.github.com> committed R9484:0a439623f75c: Merge pull request #773 from mazong1123/master (authored by Billy Donahue <BillyDonahue@users.noreply.github.com>).May 15 2016, 18:20

Commit	Author	Details	Committed
5bae126d663e	mazong1123	Added VS 2015 project support.	May 15 2016
01f3d09f9f6c	mazong1123	Updated the value of GTEST_DIR to reflect the googletest dir.	May 15 2016
2746b57f78a0	mazong1123	Changed the GTestDir marco value to reflect the new dir of googletest.	May 15 2016

		Path
M		googlemock/make/Makefile
M		googlemock/msvc/2005/gmock_config.vsprops
P		googlemock/msvc/2010/gmock_config.props Copied to googlemock/msvc/2015/gmock_config.props
A	(dir)	googlemock/msvc/2015/
P		googlemock/msvc/2015/gmock.sln Copied from googlemock/msvc/2010/gmock.sln
P		googlemock/msvc/2015/gmock.vcxproj Copied from googlemock/msvc/2010/gmock.vcxproj
P		googlemock/msvc/2015/gmock_config.props Copied from googlemock/msvc/2010/gmock_config.props
P		googlemock/msvc/2015/gmock_main.vcxproj Copied from googlemock/msvc/2010/gmock_main.vcxproj
P		googlemock/msvc/2015/gmock_test.vcxproj Copied from googlemock/msvc/2010/gmock_test.vcxproj