From 2746b57f78a05671bd605623be492dc74d6860bd Mon Sep 17 00:00:00 2001 From: mazong1123 Date: Sun, 15 May 2016 20:48:08 +0800 Subject: Changed the GTestDir marco value to reflect the new dir of googletest. --- googlemock/msvc/2005/gmock_config.vsprops | 2 +- googlemock/msvc/2010/gmock_config.props | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/googlemock/msvc/2005/gmock_config.vsprops b/googlemock/msvc/2005/gmock_config.vsprops index 8b65cfb..875939c 100644 --- a/googlemock/msvc/2005/gmock_config.vsprops +++ b/googlemock/msvc/2005/gmock_config.vsprops @@ -10,6 +10,6 @@ /> diff --git a/googlemock/msvc/2010/gmock_config.props b/googlemock/msvc/2010/gmock_config.props index bd497f1..441f31c 100644 --- a/googlemock/msvc/2010/gmock_config.props +++ b/googlemock/msvc/2010/gmock_config.props @@ -1,7 +1,7 @@ - ../../gtest + ../../../googletest <_ProjectFileVersion>10.0.30319.1 -- cgit v0.12 From 01f3d09f9f6c2743babcd819d18ce5481ef5dbf7 Mon Sep 17 00:00:00 2001 From: mazong1123 Date: Sun, 15 May 2016 21:32:56 +0800 Subject: Updated the value of GTEST_DIR to reflect the googletest dir. --- googlemock/make/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/googlemock/make/Makefile b/googlemock/make/Makefile index c1cc0e9..7c13e05 100644 --- a/googlemock/make/Makefile +++ b/googlemock/make/Makefile @@ -17,7 +17,7 @@ # Points to the root of Google Test, relative to where this file is. # Remember to tweak this if you move this file, or if you want to use # a copy of Google Test at a different location. -GTEST_DIR = ../gtest +GTEST_DIR = ../../googletest # Points to the root of Google Mock, relative to where this file is. # Remember to tweak this if you move this file. -- cgit v0.12 From 5bae126d663ee470357216f6c64410de3bab4723 Mon Sep 17 00:00:00 2001 From: mazong1123 Date: Sun, 15 May 2016 21:46:38 +0800 Subject: Added VS 2015 project support. --- googlemock/msvc/2015/gmock.sln | 32 ++++++++++ googlemock/msvc/2015/gmock.vcxproj | 84 ++++++++++++++++++++++++++ googlemock/msvc/2015/gmock_config.props | 19 ++++++ googlemock/msvc/2015/gmock_main.vcxproj | 90 ++++++++++++++++++++++++++++ googlemock/msvc/2015/gmock_test.vcxproj | 103 ++++++++++++++++++++++++++++++++ 5 files changed, 328 insertions(+) create mode 100644 googlemock/msvc/2015/gmock.sln create mode 100644 googlemock/msvc/2015/gmock.vcxproj create mode 100644 googlemock/msvc/2015/gmock_config.props create mode 100644 googlemock/msvc/2015/gmock_main.vcxproj create mode 100644 googlemock/msvc/2015/gmock_test.vcxproj diff --git a/googlemock/msvc/2015/gmock.sln b/googlemock/msvc/2015/gmock.sln new file mode 100644 index 0000000..c59e07f --- /dev/null +++ b/googlemock/msvc/2015/gmock.sln @@ -0,0 +1,32 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 14 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gmock", "gmock.vcxproj", "{34681F0D-CE45-415D-B5F2-5C662DFE3BD5}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gmock_test", "gmock_test.vcxproj", "{F10D22F8-AC7B-4213-8720-608E7D878CD2}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gmock_main", "gmock_main.vcxproj", "{E4EF614B-30DF-4954-8C53-580A0BF6B589}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {34681F0D-CE45-415D-B5F2-5C662DFE3BD5}.Debug|Win32.ActiveCfg = Debug|Win32 + {34681F0D-CE45-415D-B5F2-5C662DFE3BD5}.Debug|Win32.Build.0 = Debug|Win32 + {34681F0D-CE45-415D-B5F2-5C662DFE3BD5}.Release|Win32.ActiveCfg = Release|Win32 + {34681F0D-CE45-415D-B5F2-5C662DFE3BD5}.Release|Win32.Build.0 = Release|Win32 + {F10D22F8-AC7B-4213-8720-608E7D878CD2}.Debug|Win32.ActiveCfg = Debug|Win32 + {F10D22F8-AC7B-4213-8720-608E7D878CD2}.Debug|Win32.Build.0 = Debug|Win32 + {F10D22F8-AC7B-4213-8720-608E7D878CD2}.Release|Win32.ActiveCfg = Release|Win32 + {F10D22F8-AC7B-4213-8720-608E7D878CD2}.Release|Win32.Build.0 = Release|Win32 + {E4EF614B-30DF-4954-8C53-580A0BF6B589}.Debug|Win32.ActiveCfg = Debug|Win32 + {E4EF614B-30DF-4954-8C53-580A0BF6B589}.Debug|Win32.Build.0 = Debug|Win32 + {E4EF614B-30DF-4954-8C53-580A0BF6B589}.Release|Win32.ActiveCfg = Release|Win32 + {E4EF614B-30DF-4954-8C53-580A0BF6B589}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/googlemock/msvc/2015/gmock.vcxproj b/googlemock/msvc/2015/gmock.vcxproj new file mode 100644 index 0000000..d5ddd09 --- /dev/null +++ b/googlemock/msvc/2015/gmock.vcxproj @@ -0,0 +1,84 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {34681F0D-CE45-415D-B5F2-5C662DFE3BD5} + gmock + Win32Proj + + + + StaticLibrary + Unicode + true + v140 + + + StaticLibrary + Unicode + v140 + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)$(Configuration)\ + $(OutDir)$(ProjectName)\ + $(SolutionDir)$(Configuration)\ + $(OutDir)$(ProjectName)\ + + + + Disabled + ..\..\include;..\..;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + + Level3 + ProgramDatabase + + + + + ..\..\include;..\..;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + MultiThreaded + + + Level3 + ProgramDatabase + + + + + + $(GTestDir);%(AdditionalIncludeDirectories) + $(GTestDir);%(AdditionalIncludeDirectories) + + + + + + \ No newline at end of file diff --git a/googlemock/msvc/2015/gmock_config.props b/googlemock/msvc/2015/gmock_config.props new file mode 100644 index 0000000..77bc95b --- /dev/null +++ b/googlemock/msvc/2015/gmock_config.props @@ -0,0 +1,19 @@ + + + + ../../../googletest + + + <_ProjectFileVersion>10.0.30319.1 + + + + $(GTestDir)/include;%(AdditionalIncludeDirectories) + + + + + $(GTestDir) + + + diff --git a/googlemock/msvc/2015/gmock_main.vcxproj b/googlemock/msvc/2015/gmock_main.vcxproj new file mode 100644 index 0000000..76cc68b --- /dev/null +++ b/googlemock/msvc/2015/gmock_main.vcxproj @@ -0,0 +1,90 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {E4EF614B-30DF-4954-8C53-580A0BF6B589} + gmock_main + Win32Proj + + + + StaticLibrary + Unicode + true + v140 + + + StaticLibrary + Unicode + v140 + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)$(Configuration)\ + $(OutDir)$(ProjectName)\ + $(SolutionDir)$(Configuration)\ + $(OutDir)$(ProjectName)\ + + + + Disabled + ../../include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + + Level3 + ProgramDatabase + + + + + ../../include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + MultiThreaded + + + Level3 + ProgramDatabase + + + + + {34681f0d-ce45-415d-b5f2-5c662dfe3bd5} + true + true + + + + + ../../include;%(AdditionalIncludeDirectories) + ../../include;%(AdditionalIncludeDirectories) + + + + + + \ No newline at end of file diff --git a/googlemock/msvc/2015/gmock_test.vcxproj b/googlemock/msvc/2015/gmock_test.vcxproj new file mode 100644 index 0000000..76ea553 --- /dev/null +++ b/googlemock/msvc/2015/gmock_test.vcxproj @@ -0,0 +1,103 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {F10D22F8-AC7B-4213-8720-608E7D878CD2} + gmock_test + Win32Proj + + + + Application + Unicode + true + v140 + + + Application + Unicode + v140 + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)$(Configuration)\ + $(OutDir)$(ProjectName)\ + true + $(SolutionDir)$(Configuration)\ + $(OutDir)$(ProjectName)\ + false + + + + /bigobj %(AdditionalOptions) + Disabled + ..\..\include;..\..;$(GTestDir);%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + + Level3 + ProgramDatabase + + + true + Console + MachineX86 + + + + + /bigobj %(AdditionalOptions) + ..\..\include;..\..;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreaded + + + Level3 + ProgramDatabase + + + true + Console + true + true + MachineX86 + + + + + {e4ef614b-30df-4954-8c53-580a0bf6b589} + true + true + + + + + + + + + \ No newline at end of file -- cgit v0.12