Commit 99c3a4d4 authored by aroben@apple.com's avatar aroben@apple.com

A little gtest cleanup after r86287

Source/ThirdParty:

* gtest/msvc/gtest-md.vcproj: Added Debug_All and Production configurations to match our
other projects. (At some point all the settings should be moved into .vsprops files to match
our other projects, too.)

Source/WebKit/win:

* WebKit.vcproj/WebKit.sln:
    - Move gtest into the Tools folder
    - Make gtest build just before TestWebKitAPIGenerated
    - Use gtest's new Debug_All and Production configurations as appropriate

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@86336 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent aa696027
2011-05-12 Adam Roben <aroben@apple.com>
A little gtest cleanup after r86287
* gtest/msvc/gtest-md.vcproj: Added Debug_All and Production configurations to match our
other projects. (At some point all the settings should be moved into .vsprops files to match
our other projects, too.)
......@@ -263,6 +263,131 @@
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Production|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="4"
InheritedPropertySheets="$(ProjectDir)\..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops"
CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="false"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLibrarianTool"
OutputFile="$(OutDir)\gtest.lib"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Debug_All|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="4"
InheritedPropertySheets="$(ProjectDir)\..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops"
CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="false"
DebugInformationFormat="4"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLibrarianTool"
OutputFile="$(OutDir)\gtest.lib"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
</Configurations>
<References>
</References>
......@@ -307,6 +432,22 @@
AdditionalIncludeDirectories="&quot;..&quot;;&quot;..\include&quot;"
/>
</FileConfiguration>
<FileConfiguration
Name="Production|Win32"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="&quot;..&quot;;&quot;..\include&quot;"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug_All|Win32"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="&quot;..&quot;;&quot;..\include&quot;"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\src\gtest-filepath.cc"
......@@ -343,6 +484,22 @@
AdditionalIncludeDirectories="&quot;..&quot;;&quot;..\include&quot;"
/>
</FileConfiguration>
<FileConfiguration
Name="Production|Win32"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="&quot;..&quot;;&quot;..\include&quot;"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug_All|Win32"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="&quot;..&quot;;&quot;..\include&quot;"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\src\gtest-port.cc"
......@@ -379,6 +536,22 @@
AdditionalIncludeDirectories="&quot;..&quot;;&quot;..\include&quot;"
/>
</FileConfiguration>
<FileConfiguration
Name="Production|Win32"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="&quot;..&quot;;&quot;..\include&quot;"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug_All|Win32"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="&quot;..&quot;;&quot;..\include&quot;"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\src\gtest-test-part.cc"
......@@ -415,6 +588,22 @@
AdditionalIncludeDirectories="&quot;..&quot;;&quot;..\include&quot;"
/>
</FileConfiguration>
<FileConfiguration
Name="Production|Win32"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="&quot;..&quot;;&quot;..\include&quot;"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug_All|Win32"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="&quot;..&quot;;&quot;..\include&quot;"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\src\gtest-typed-test.cc"
......@@ -451,6 +640,22 @@
AdditionalIncludeDirectories="&quot;..&quot;;&quot;..\include&quot;"
/>
</FileConfiguration>
<FileConfiguration
Name="Production|Win32"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="&quot;..&quot;;&quot;..\include&quot;"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug_All|Win32"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="&quot;..&quot;;&quot;..\include&quot;"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\src\gtest.cc"
......@@ -487,6 +692,22 @@
AdditionalIncludeDirectories="&quot;..&quot;;&quot;..\include&quot;"
/>
</FileConfiguration>
<FileConfiguration
Name="Production|Win32"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="&quot;..&quot;;&quot;..\include&quot;"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug_All|Win32"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="&quot;..&quot;;&quot;..\include&quot;"
/>
</FileConfiguration>
</File>
</Filter>
<Filter
......
2011-05-12 Adam Roben <aroben@apple.com>
A little gtest cleanup after r86287
* WebKit.vcproj/WebKit.sln:
- Move gtest into the Tools folder
- Make gtest build just before TestWebKitAPIGenerated
- Use gtest's new Debug_All and Production configurations as appropriate
2011-05-12 Nikolas Zimmermann <nzimmermann@rim.com>
Reviewed by Darin Adler.
......
This diff is collapsed.
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