diff options
| author | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2009-09-11 06:02:00 +0000 |
|---|---|---|
| committer | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2009-09-11 06:02:00 +0000 |
| commit | 6e6850626b2058ee7ec1be7a98b6aebaf403a3aa (patch) | |
| tree | 1c73a04b1d0946852ff0f640373d3a7aa80bef36 /msvc | |
| parent | 807fc799f623ecc14803ed3224df729c42c0a366 (diff) | |
| download | googletest-6e6850626b2058ee7ec1be7a98b6aebaf403a3aa.tar.gz | |
Adjusts VC projects' output directories such that the output files don't step on each other.
git-svn-id: http://googletest.googlecode.com/svn/trunk@304 861a406c-534a-0410-8894-cb66d6ee9925
Diffstat (limited to 'msvc')
| -rwxr-xr-x | msvc/gtest-md.vcproj | 8 | ||||
| -rw-r--r-- | msvc/gtest.vcproj | 8 | ||||
| -rwxr-xr-x | msvc/gtest_main-md.vcproj | 8 | ||||
| -rw-r--r-- | msvc/gtest_main.vcproj | 8 | ||||
| -rwxr-xr-x | msvc/gtest_prod_test-md.vcproj | 8 | ||||
| -rw-r--r-- | msvc/gtest_prod_test.vcproj | 8 | ||||
| -rwxr-xr-x | msvc/gtest_unittest-md.vcproj | 8 | ||||
| -rw-r--r-- | 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 abc3c39..c78a4a4 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=""..\include";".."">
diff --git a/msvc/gtest.vcproj b/msvc/gtest.vcproj index b3720b3..bd2ed81 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=""..\include";".."">
diff --git a/msvc/gtest_main-md.vcproj b/msvc/gtest_main-md.vcproj index 5c7c933..321667f 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=""..\include";".."">
diff --git a/msvc/gtest_main.vcproj b/msvc/gtest_main.vcproj index 93e532d..13cc1d4 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=""..\include";".."">
diff --git a/msvc/gtest_prod_test-md.vcproj b/msvc/gtest_prod_test-md.vcproj index bb912f4..05b05d9 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 336e8db..6d7a2f0 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 6da35d1..38a5e56 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 58203e5..cb1f52b 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
|