diff options
| author | zhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386> | 2010-09-09 22:16:17 +0000 |
|---|---|---|
| committer | zhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386> | 2010-09-09 22:16:17 +0000 |
| commit | ad7c462be7ea6041419426f98b5653bd98ad14dc (patch) | |
| tree | 18ca188e9aa26fdc91191d3973aa4bd6cf9c6e9d | |
| parent | 2516f60da9073f3b04c0bbfc37d3aefffe11767e (diff) | |
| download | googletest-ad7c462be7ea6041419426f98b5653bd98ad14dc.tar.gz googletest-ad7c462be7ea6041419426f98b5653bd98ad14dc.tar.bz2 googletest-ad7c462be7ea6041419426f98b5653bd98ad14dc.zip | |
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.
| -rw-r--r-- | msvc/gmock.vcproj | 70 | ||||
| -rw-r--r-- | msvc/gmock_main.vcproj | 2 | ||||
| -rw-r--r-- | msvc/gmock_test.vcproj | 48 |
3 files changed, 9 insertions, 111 deletions
diff --git a/msvc/gmock.vcproj b/msvc/gmock.vcproj index 39d9dc9e..e50f88ce 100644 --- a/msvc/gmock.vcproj +++ b/msvc/gmock.vcproj @@ -41,7 +41,7 @@ <Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="../include"
+ AdditionalIncludeDirectories="..\include;.."
PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -105,7 +105,7 @@ />
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../include"
+ AdditionalIncludeDirectories="..\include;.."
PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
RuntimeLibrary="0"
UsePrecompiledHeader="0"
@@ -151,23 +151,7 @@ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
- RelativePath="..\src\gmock-cardinalities.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"
+ RelativePath="..\src\gmock-all.cc"
>
</File>
<File
@@ -196,58 +180,10 @@ Filter="h;hpp;hxx;hm;inl;inc;xsd"
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
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>
</Files>
<Globals>
diff --git a/msvc/gmock_main.vcproj b/msvc/gmock_main.vcproj index 8e0eccb8..f0e2fa3c 100644 --- a/msvc/gmock_main.vcproj +++ b/msvc/gmock_main.vcproj @@ -170,7 +170,7 @@ >
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
+ AdditionalIncludeDirectories="../include"
/>
</FileConfiguration>
</File>
diff --git a/msvc/gmock_test.vcproj b/msvc/gmock_test.vcproj index fd969d7c..a0a2f0e5 100644 --- a/msvc/gmock_test.vcproj +++ b/msvc/gmock_test.vcproj @@ -40,8 +40,9 @@ />
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/bigobj"
Optimization="0"
- AdditionalIncludeDirectories="../include"
+ AdditionalIncludeDirectories="..\include;.."
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -118,7 +119,8 @@ />
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../include"
+ AdditionalOptions="/bigobj"
+ AdditionalIncludeDirectories="..\include;.."
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
RuntimeLibrary="0"
UsePrecompiledHeader="0"
@@ -183,47 +185,7 @@ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
- RelativePath="..\test\gmock-actions_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"
+ RelativePath="..\test\gmock_all_test.cc"
>
</File>
</Filter>
|