Windows production build fix

* gtest/msvc/gtest-md.vcproj: Fix the OutputDirectory and IntermediateDirectory attributes
for all configurations.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@86347 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/ThirdParty/ChangeLog b/Source/ThirdParty/ChangeLog
index 6f884780b9a4c521c4f8884fb24eda3e1cfd201c..e1274b48080a1313d628c40f26604d5a4f2cb7a3 100644 (file)
--- a/Source/ThirdParty/ChangeLog
+++ b/Source/ThirdParty/ChangeLog
@@ -1,3 +1,10 @@
+2011-05-12  Adam Roben  <aroben@apple.com>
+
+        Windows production build fix
+
+        * gtest/msvc/gtest-md.vcproj: Fix the OutputDirectory and IntermediateDirectory attributes
+        for all configurations.
+
 2011-05-12  Adam Roben  <aroben@apple.com>
 
         A little gtest cleanup after r86287

diff --git a/Source/ThirdParty/gtest/msvc/gtest-md.vcproj b/Source/ThirdParty/gtest/msvc/gtest-md.vcproj
index 39e6437a83e7ce8d9843e512669b932d2f66788c..d88d001a97e32d638c17bee2aec583146cf3ed65 100644 (file)
--- a/Source/ThirdParty/gtest/msvc/gtest-md.vcproj
+++ b/Source/ThirdParty/gtest/msvc/gtest-md.vcproj
@@ -18,6 +18,7 @@
                <Configuration
                        Name="Debug|Win32"
                        OutputDirectory="$(ConfigurationBuildDir)\lib"
+                       IntermediateDirectory="$(ConfigurationBuildDir)\obj\$(ProjectName)"
                        ConfigurationType="4"
                        InheritedPropertySheets="$(ProjectDir)\..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops"
                        CharacterSet="2"
@@ -265,8 +266,8 @@
                </Configuration>
                <Configuration
                        Name="Production|Win32"
-                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-                       IntermediateDirectory="$(ConfigurationName)"
+                       OutputDirectory="$(ConfigurationBuildDir)\lib"
+                       IntermediateDirectory="$(ConfigurationBuildDir)\obj\$(ProjectName)"
                        ConfigurationType="4"
                        InheritedPropertySheets="$(ProjectDir)\..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops"
                        CharacterSet="2"
@@ -326,8 +327,8 @@
                </Configuration>
                <Configuration
                        Name="Debug_All|Win32"
-                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-                       IntermediateDirectory="$(ConfigurationName)"
+                       OutputDirectory="$(ConfigurationBuildDir)\lib"
+                       IntermediateDirectory="$(ConfigurationBuildDir)\obj\$(ProjectName)"
                        ConfigurationType="4"
                        InheritedPropertySheets="$(ProjectDir)\..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops"
                        CharacterSet="2"