Skip to content

G
googletest
Commit ad7c462b by zhanyong.wan
Options

Simplifies the VC projects by using gmock-all.cc and

gmock_all_test.cc. Also fixes a missing include directory for gmock_main in the Release mode. I had to add /bigobj to gmock_test.vcproj to make the compiler happy, as we now need to generate code for many functions in the same translation unit.
parent 2516f60d
Showing with 9 additions and 111 deletions
msvc/gmock.vcproj
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="../include" AdditionalIncludeDirectories="..\include;.."
PreprocessorDefinitions="WIN32;_DEBUG;_LIB" PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
...@@ -105,7 +105,7 @@ ...@@ -105,7 +105,7 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="../include" AdditionalIncludeDirectories="..\include;.."
PreprocessorDefinitions="WIN32;NDEBUG;_LIB" PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
RuntimeLibrary="0" RuntimeLibrary="0"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
...@@ -151,23 +151,7 @@ ...@@ -151,23 +151,7 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
> >
<File <File
RelativePath="..\src\gmock-cardinalities.cc" RelativePath="..\src\gmock-all.cc"
>
</File>
<File
RelativePath="..\src\gmock-internal-utils.cc"
>
</File>
<File
RelativePath="..\src\gmock-matchers.cc"
>
</File>
<File
RelativePath="..\src\gmock-spec-builders.cc"
>
</File>
<File
RelativePath="..\src\gmock.cc"
> >
</File> </File>
<File <File
...@@ -196,58 +180,10 @@ ...@@ -196,58 +180,10 @@
Filter="h;hpp;hxx;hm;inl;inc;xsd" Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
> >
<File
RelativePath="..\include\gmock\gmock-actions.h"
>
</File>
<File
RelativePath="..\include\gmock\gmock-cardinalities.h"
>
</File>
<File
RelativePath="..\include\gmock\gmock-generated-actions.h"
>
</File>
<File
RelativePath="..\include\gmock\gmock-generated-function-mockers.h"
>
</File>
<File
RelativePath="..\include\gmock\gmock-generated-matchers.h"
>
</File>
<File
RelativePath="..\include\gmock\gmock-generated-nice-strict.h"
>
</File>
<File
RelativePath="..\include\gmock\gmock-matchers.h"
>
</File>
<File
RelativePath="..\include\gmock\gmock-spec-builders.h"
>
</File>
<File
RelativePath="..\include\gmock\gmock.h"
>
</File>
</Filter> </Filter>
<Filter <Filter
Name="Private Header Files" Name="Private Header Files"
> >
<File
RelativePath="..\include\gmock\internal\gmock-generated-internal-utils.h"
>
</File>
<File
RelativePath="..\include\gmock\internal\gmock-internal-utils.h"
>
</File>
<File
RelativePath="..\include\gmock\internal\gmock-port.h"
>
</File>
</Filter> </Filter>
</Files> </Files>
<Globals> <Globals>
......
msvc/gmock_main.vcproj
...@@ -170,7 +170,7 @@ ...@@ -170,7 +170,7 @@
> >
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="" AdditionalIncludeDirectories="../include"
/> />
</FileConfiguration> </FileConfiguration>
</File> </File>
......
msvc/gmock_test.vcproj
...@@ -40,8 +40,9 @@ ...@@ -40,8 +40,9 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalOptions="/bigobj"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="../include" AdditionalIncludeDirectories="..\include;.."
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
...@@ -118,7 +119,8 @@ ...@@ -118,7 +119,8 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="../include" AdditionalOptions="/bigobj"
AdditionalIncludeDirectories="..\include;.."
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
RuntimeLibrary="0" RuntimeLibrary="0"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
...@@ -183,47 +185,7 @@ ...@@ -183,47 +185,7 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
> >
<File <File
RelativePath="..\test\gmock-actions_test.cc" RelativePath="..\test\gmock_all_test.cc"
>
</File>
<File
RelativePath="..\test\gmock-cardinalities_test.cc"
>
</File>
<File
RelativePath="..\test\gmock-generated-actions_test.cc"
>
</File>
<File
RelativePath="..\test\gmock-generated-function-mockers_test.cc"
>
</File>
<File
RelativePath="..\test\gmock-generated-internal-utils_test.cc"
>
</File>
<File
RelativePath="..\test\gmock-generated-matchers_test.cc"
>
</File>
<File
RelativePath="..\test\gmock-internal-utils_test.cc"
>
</File>
<File
RelativePath="..\test\gmock-matchers_test.cc"
>
</File>
<File
RelativePath="..\test\gmock-nice-strict_test.cc"
>
</File>
<File
RelativePath="..\test\gmock-port_test.cc"
>
</File>
<File
RelativePath="..\test\gmock_test.cc"
> >
</File> </File>
</Filter> </Filter>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment