From f6dd67a1550d25518cc37758364834f4f92a3570 Mon Sep 17 00:00:00 2001
From: "zhanyong.wan" <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925>
Date: Fri, 11 Sep 2009 06:02:00 +0000
Subject: [PATCH] Adjusts VC projects' output directories such that the output
 files don't step on each other.

---
 msvc/gtest-md.vcproj           | 8 ++++----
 msvc/gtest.vcproj              | 8 ++++----
 msvc/gtest_main-md.vcproj      | 8 ++++----
 msvc/gtest_main.vcproj         | 8 ++++----
 msvc/gtest_prod_test-md.vcproj | 8 ++++----
 msvc/gtest_prod_test.vcproj    | 8 ++++----
 msvc/gtest_unittest-md.vcproj  | 8 ++++----
 msvc/gtest_unittest.vcproj     | 8 ++++----
 8 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/msvc/gtest-md.vcproj b/msvc/gtest-md.vcproj
index abc3c39b..c78a4a4d 100755
--- a/msvc/gtest-md.vcproj
+++ b/msvc/gtest-md.vcproj
@@ -12,8 +12,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="Debug"
-			IntermediateDirectory="Debug"
+			OutputDirectory="$(SolutionName)/$(ConfigurationName)"
+			IntermediateDirectory="$(OutDir)/$(ProjectName)"
 			ConfigurationType="4"
 			CharacterSet="2"
 			ReferencesPath="">
@@ -54,8 +54,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="Release"
-			IntermediateDirectory="Release"
+			OutputDirectory="$(SolutionName)/$(ConfigurationName)"
+			IntermediateDirectory="$(OutDir)/$(ProjectName)"
 			ConfigurationType="4"
 			CharacterSet="2"
 			ReferencesPath="&quot;..\include&quot;;&quot;..&quot;">
diff --git a/msvc/gtest.vcproj b/msvc/gtest.vcproj
index b3720b30..bd2ed81e 100644
--- a/msvc/gtest.vcproj
+++ b/msvc/gtest.vcproj
@@ -12,8 +12,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="Debug"
-			IntermediateDirectory="Debug"
+			OutputDirectory="$(SolutionName)/$(ConfigurationName)"
+			IntermediateDirectory="$(OutDir)/$(ProjectName)"
 			ConfigurationType="4"
 			CharacterSet="2"
 			ReferencesPath="">
@@ -54,8 +54,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="Release"
-			IntermediateDirectory="Release"
+			OutputDirectory="$(SolutionName)/$(ConfigurationName)"
+			IntermediateDirectory="$(OutDir)/$(ProjectName)"
 			ConfigurationType="4"
 			CharacterSet="2"
 			ReferencesPath="&quot;..\include&quot;;&quot;..&quot;">
diff --git a/msvc/gtest_main-md.vcproj b/msvc/gtest_main-md.vcproj
index 5c7c9335..321667f1 100755
--- a/msvc/gtest_main-md.vcproj
+++ b/msvc/gtest_main-md.vcproj
@@ -12,8 +12,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="Debug"
-			IntermediateDirectory="Debug"
+			OutputDirectory="$(SolutionName)/$(ConfigurationName)"
+			IntermediateDirectory="$(OutDir)/$(ProjectName)"
 			ConfigurationType="4"
 			CharacterSet="2"
 			ReferencesPath="">
@@ -54,8 +54,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="Release"
-			IntermediateDirectory="Release"
+			OutputDirectory="$(SolutionName)/$(ConfigurationName)"
+			IntermediateDirectory="$(OutDir)/$(ProjectName)"
 			ConfigurationType="4"
 			CharacterSet="2"
 			ReferencesPath="&quot;..\include&quot;;&quot;..&quot;">
diff --git a/msvc/gtest_main.vcproj b/msvc/gtest_main.vcproj
index 93e532dd..13cc1d4f 100644
--- a/msvc/gtest_main.vcproj
+++ b/msvc/gtest_main.vcproj
@@ -12,8 +12,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="Debug"
-			IntermediateDirectory="Debug"
+			OutputDirectory="$(SolutionName)/$(ConfigurationName)"
+			IntermediateDirectory="$(OutDir)/$(ProjectName)"
 			ConfigurationType="4"
 			CharacterSet="2"
 			ReferencesPath="">
@@ -54,8 +54,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="Release"
-			IntermediateDirectory="Release"
+			OutputDirectory="$(SolutionName)/$(ConfigurationName)"
+			IntermediateDirectory="$(OutDir)/$(ProjectName)"
 			ConfigurationType="4"
 			CharacterSet="2"
 			ReferencesPath="&quot;..\include&quot;;&quot;..&quot;">
diff --git a/msvc/gtest_prod_test-md.vcproj b/msvc/gtest_prod_test-md.vcproj
index bb912f4c..05b05d9e 100755
--- a/msvc/gtest_prod_test-md.vcproj
+++ b/msvc/gtest_prod_test-md.vcproj
@@ -12,8 +12,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="Debug"
-			IntermediateDirectory="Debug"
+			OutputDirectory="$(SolutionName)/$(ConfigurationName)"
+			IntermediateDirectory="$(OutDir)/$(ProjectName)"
 			ConfigurationType="1"
 			CharacterSet="2">
 			<Tool
@@ -60,8 +60,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="Release"
-			IntermediateDirectory="Release"
+			OutputDirectory="$(SolutionName)/$(ConfigurationName)"
+			IntermediateDirectory="$(OutDir)/$(ProjectName)"
 			ConfigurationType="1"
 			CharacterSet="2">
 			<Tool
diff --git a/msvc/gtest_prod_test.vcproj b/msvc/gtest_prod_test.vcproj
index 336e8dbf..6d7a2f02 100644
--- a/msvc/gtest_prod_test.vcproj
+++ b/msvc/gtest_prod_test.vcproj
@@ -12,8 +12,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="Debug"
-			IntermediateDirectory="Debug"
+			OutputDirectory="$(SolutionName)/$(ConfigurationName)"
+			IntermediateDirectory="$(OutDir)/$(ProjectName)"
 			ConfigurationType="1"
 			CharacterSet="2">
 			<Tool
@@ -60,8 +60,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="Release"
-			IntermediateDirectory="Release"
+			OutputDirectory="$(SolutionName)/$(ConfigurationName)"
+			IntermediateDirectory="$(OutDir)/$(ProjectName)"
 			ConfigurationType="1"
 			CharacterSet="2">
 			<Tool
diff --git a/msvc/gtest_unittest-md.vcproj b/msvc/gtest_unittest-md.vcproj
index 6da35d18..38a5e566 100755
--- a/msvc/gtest_unittest-md.vcproj
+++ b/msvc/gtest_unittest-md.vcproj
@@ -12,8 +12,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="Debug"
-			IntermediateDirectory="Debug"
+			OutputDirectory="$(SolutionName)/$(ConfigurationName)"
+			IntermediateDirectory="$(OutDir)/$(ProjectName)"
 			ConfigurationType="1"
 			CharacterSet="2">
 			<Tool
@@ -60,8 +60,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="Release"
-			IntermediateDirectory="Release"
+			OutputDirectory="$(SolutionName)/$(ConfigurationName)"
+			IntermediateDirectory="$(OutDir)/$(ProjectName)"
 			ConfigurationType="1"
 			CharacterSet="2">
 			<Tool
diff --git a/msvc/gtest_unittest.vcproj b/msvc/gtest_unittest.vcproj
index 58203e5a..cb1f52b1 100644
--- a/msvc/gtest_unittest.vcproj
+++ b/msvc/gtest_unittest.vcproj
@@ -12,8 +12,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="Debug"
-			IntermediateDirectory="Debug"
+			OutputDirectory="$(SolutionName)/$(ConfigurationName)"
+			IntermediateDirectory="$(OutDir)/$(ProjectName)"
 			ConfigurationType="1"
 			CharacterSet="2">
 			<Tool
@@ -60,8 +60,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="Release"
-			IntermediateDirectory="Release"
+			OutputDirectory="$(SolutionName)/$(ConfigurationName)"
+			IntermediateDirectory="$(OutDir)/$(ProjectName)"
 			ConfigurationType="1"
 			CharacterSet="2">
 			<Tool