From b3e904227f81fc6d2ea577dadbc3e510a989bbd2 Mon Sep 17 00:00:00 2001 From: vladlosev Date: Sat, 12 Feb 2011 01:56:45 +0000 Subject: [PATCH] Adds project files for MSVC 2010 (by Fredrik Roubert). --- Makefile.am | 20 ++- README | 14 +- msvc/{ => 2005}/gmock.sln | 12 -- msvc/{ => 2005}/gmock.vcproj | 6 +- msvc/{ => 2005}/gmock_config.vsprops | 2 +- msvc/{ => 2005}/gmock_main.vcproj | 10 +- msvc/{ => 2005}/gmock_test.vcproj | 6 +- msvc/2010/gmock.sln | 32 +++++ msvc/2010/gmock.vcxproj | 82 +++++++++++ msvc/2010/gmock_config.props | 19 +++ msvc/2010/gmock_main.vcxproj | 88 ++++++++++++ msvc/2010/gmock_test.vcxproj | 101 +++++++++++++ msvc/gmock-spec-builders_test.vcproj | 205 --------------------------- msvc/gmock_link_test.vcproj | 203 -------------------------- 14 files changed, 355 insertions(+), 445 deletions(-) rename msvc/{ => 2005}/gmock.sln (64%) rename msvc/{ => 2005}/gmock.vcproj (91%) rename msvc/{ => 2005}/gmock_config.vsprops (89%) rename msvc/{ => 2005}/gmock_main.vcproj (89%) rename msvc/{ => 2005}/gmock_test.vcproj (91%) create mode 100644 msvc/2010/gmock.sln create mode 100644 msvc/2010/gmock.vcxproj create mode 100644 msvc/2010/gmock_config.props create mode 100644 msvc/2010/gmock_main.vcxproj create mode 100644 msvc/2010/gmock_test.vcxproj delete mode 100755 msvc/gmock-spec-builders_test.vcproj delete mode 100644 msvc/gmock_link_test.vcproj diff --git a/Makefile.am b/Makefile.am index 2d967dcc..e02c07e1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -155,13 +155,19 @@ EXTRA_DIST += \ # Microsoft Visual Studio 2005 projects. EXTRA_DIST += \ - msvc/gmock-spec-builders_test.vcproj \ - msvc/gmock.sln \ - msvc/gmock.vcproj \ - msvc/gmock_config.vsprops \ - msvc/gmock_link_test.vcproj \ - msvc/gmock_main.vcproj \ - msvc/gmock_test.vcproj + msvc/2005/gmock.sln \ + msvc/2005/gmock.vcproj \ + msvc/2005/gmock_config.vsprops \ + msvc/2005/gmock_main.vcproj \ + msvc/2005/gmock_test.vcproj + +# Microsoft Visual Studio 2010 projects. +EXTRA_DIST += \ + msvc/2010/gmock.sln \ + msvc/2010/gmock.vcxproj \ + msvc/2010/gmock_config.props \ + msvc/2010/gmock_main.vcxproj \ + msvc/2010/gmock_test.vcxproj # gmock_test.cc does not really depend on files generated by the # fused-gmock-internal rule. However, gmock_test.o does, and it is diff --git a/README b/README index 8e4150aa..aa3283d7 100644 --- a/README +++ b/README @@ -208,16 +208,18 @@ it. ### Windows ### -The msvc/ directory contains VC++ 2005 projects for building Google -Mock and selected tests. +The msvc/2005 directory contains VC++ 2005 projects and the msvc/2010 +directory contains VC++ 2010 projects for building Google Mock and +selected tests. -Open msvc/gmock.sln and build the library and tests. If you want to -create your own project to use with Google Mock, you'll have to -configure it to use the gmock_config propety sheet. For that: +Change to the appropriate directory and run "msbuild gmock.sln" to +build the library and tests (or open the gmock.sln in the MSVC IDE). +If you want to create your own project to use with Google Mock, you'll +have to configure it to use the gmock_config propety sheet. For that: * Open the Property Manager window (View | Other Windows | Property Manager) * Right-click on your project and select "Add Existing Property Sheet..." - * Navigate to gmock_config.vsprops and select it. + * Navigate to gmock_config.vsprops or gmock_config.props and select it. * In Project Properties | Configuration Properties | General | Additional Include Directories, type /include. diff --git a/msvc/gmock.sln b/msvc/2005/gmock.sln similarity index 64% rename from msvc/gmock.sln rename to msvc/2005/gmock.sln index f56dda64..b752f876 100644 --- a/msvc/gmock.sln +++ b/msvc/2005/gmock.sln @@ -5,12 +5,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gmock", "gmock.vcproj", "{3 EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gmock_test", "gmock_test.vcproj", "{F10D22F8-AC7B-4213-8720-608E7D878CD2}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gmock_link_test", "gmock_link_test.vcproj", "{ED597847-A714-4327-B569-70029D2311F0}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gmock_main", "gmock_main.vcproj", "{E4EF614B-30DF-4954-8C53-580A0BF6B589}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gmock-spec-builders_test", "gmock-spec-builders_test.vcproj", "{46972604-5BE0-4493-BAE3-878DB825FDCB}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -25,18 +21,10 @@ Global {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 - {ED597847-A714-4327-B569-70029D2311F0}.Debug|Win32.ActiveCfg = Debug|Win32 - {ED597847-A714-4327-B569-70029D2311F0}.Debug|Win32.Build.0 = Debug|Win32 - {ED597847-A714-4327-B569-70029D2311F0}.Release|Win32.ActiveCfg = Release|Win32 - {ED597847-A714-4327-B569-70029D2311F0}.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 - {46972604-5BE0-4493-BAE3-878DB825FDCB}.Debug|Win32.ActiveCfg = Debug|Win32 - {46972604-5BE0-4493-BAE3-878DB825FDCB}.Debug|Win32.Build.0 = Debug|Win32 - {46972604-5BE0-4493-BAE3-878DB825FDCB}.Release|Win32.ActiveCfg = Release|Win32 - {46972604-5BE0-4493-BAE3-878DB825FDCB}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/msvc/gmock.vcproj b/msvc/2005/gmock.vcproj similarity index 91% rename from msvc/gmock.vcproj rename to msvc/2005/gmock.vcproj index e50f88ce..4bbfe989 100644 --- a/msvc/gmock.vcproj +++ b/msvc/2005/gmock.vcproj @@ -41,7 +41,7 @@ diff --git a/msvc/gmock_main.vcproj b/msvc/2005/gmock_main.vcproj similarity index 89% rename from msvc/gmock_main.vcproj rename to msvc/2005/gmock_main.vcproj index f0e2fa3c..01505a93 100644 --- a/msvc/gmock_main.vcproj +++ b/msvc/2005/gmock_main.vcproj @@ -41,7 +41,7 @@ diff --git a/msvc/gmock_test.vcproj b/msvc/2005/gmock_test.vcproj similarity index 91% rename from msvc/gmock_test.vcproj rename to msvc/2005/gmock_test.vcproj index a0a2f0e5..d1e01e71 100644 --- a/msvc/gmock_test.vcproj +++ b/msvc/2005/gmock_test.vcproj @@ -42,7 +42,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/bigobj" Optimization="0" - AdditionalIncludeDirectories="..\include;.." + AdditionalIncludeDirectories="..\..\include;..\.." PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -120,7 +120,7 @@ diff --git a/msvc/2010/gmock.sln b/msvc/2010/gmock.sln new file mode 100644 index 00000000..d9496569 --- /dev/null +++ b/msvc/2010/gmock.sln @@ -0,0 +1,32 @@ + +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual C++ Express 2010 +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/msvc/2010/gmock.vcxproj b/msvc/2010/gmock.vcxproj new file mode 100644 index 00000000..21a85ef6 --- /dev/null +++ b/msvc/2010/gmock.vcxproj @@ -0,0 +1,82 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {34681F0D-CE45-415D-B5F2-5C662DFE3BD5} + gmock + Win32Proj + + + + StaticLibrary + Unicode + true + + + StaticLibrary + Unicode + + + + + + + + + + + + + + + <_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) + + + + + + diff --git a/msvc/2010/gmock_config.props b/msvc/2010/gmock_config.props new file mode 100644 index 00000000..bd497f1d --- /dev/null +++ b/msvc/2010/gmock_config.props @@ -0,0 +1,19 @@ + + + + ../../gtest + + + <_ProjectFileVersion>10.0.30319.1 + + + + $(GTestDir)/include;%(AdditionalIncludeDirectories) + + + + + $(GTestDir) + + + diff --git a/msvc/2010/gmock_main.vcxproj b/msvc/2010/gmock_main.vcxproj new file mode 100644 index 00000000..27fecd5f --- /dev/null +++ b/msvc/2010/gmock_main.vcxproj @@ -0,0 +1,88 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {E4EF614B-30DF-4954-8C53-580A0BF6B589} + gmock_main + Win32Proj + + + + StaticLibrary + Unicode + true + + + StaticLibrary + Unicode + + + + + + + + + + + + + + + <_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) + + + + + + diff --git a/msvc/2010/gmock_test.vcxproj b/msvc/2010/gmock_test.vcxproj new file mode 100644 index 00000000..265439ec --- /dev/null +++ b/msvc/2010/gmock_test.vcxproj @@ -0,0 +1,101 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {F10D22F8-AC7B-4213-8720-608E7D878CD2} + gmock_test + Win32Proj + + + + Application + Unicode + true + + + Application + Unicode + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)$(Configuration)\ + $(OutDir)$(ProjectName)\ + true + $(SolutionDir)$(Configuration)\ + $(OutDir)$(ProjectName)\ + false + + + + /bigobj %(AdditionalOptions) + Disabled + ..\..\include;..\..;%(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 + + + + + + + + + diff --git a/msvc/gmock-spec-builders_test.vcproj b/msvc/gmock-spec-builders_test.vcproj deleted file mode 100755 index 84407420..00000000 --- a/msvc/gmock-spec-builders_test.vcproj +++ /dev/null @@ -1,205 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/msvc/gmock_link_test.vcproj b/msvc/gmock_link_test.vcproj deleted file mode 100644 index 3c1ee142..00000000 --- a/msvc/gmock_link_test.vcproj +++ /dev/null @@ -1,203 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -