Skip to content

GitLab

Commit f6dd67a1 authored by zhanyong.wan's avatar zhanyong.wan
Browse files

Adjusts VC projects' output directories such that the output files don't step on each other.

parent b8c172f6
Show whitespace changes
Inline Side-by-side
Showing with 32 additions and 32 deletions
msvc/gtest-md.vcproj
View file @ f6dd67a1
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
<Configurations> <Configurations>
<Configuration <Configuration
Name="Debug|Win32" Name="Debug|Win32"
OutputDirectory="Debug" OutputDirectory="$(SolutionName)/$(ConfigurationName)"
IntermediateDirectory="Debug" IntermediateDirectory="$(OutDir)/$(ProjectName)"
ConfigurationType="4" ConfigurationType="4"
CharacterSet="2" CharacterSet="2"
ReferencesPath=""> ReferencesPath="">
...@@ -54,8 +54,8 @@ ...@@ -54,8 +54,8 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release|Win32" Name="Release|Win32"
OutputDirectory="Release" OutputDirectory="$(SolutionName)/$(ConfigurationName)"
IntermediateDirectory="Release" IntermediateDirectory="$(OutDir)/$(ProjectName)"
ConfigurationType="4" ConfigurationType="4"
CharacterSet="2" CharacterSet="2"
ReferencesPath="&quot;..\include&quot;;&quot;..&quot;"> ReferencesPath="&quot;..\include&quot;;&quot;..&quot;">
......
msvc/gtest.vcproj
View file @ f6dd67a1
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
<Configurations> <Configurations>
<Configuration <Configuration
Name="Debug|Win32" Name="Debug|Win32"
OutputDirectory="Debug" OutputDirectory="$(SolutionName)/$(ConfigurationName)"
IntermediateDirectory="Debug" IntermediateDirectory="$(OutDir)/$(ProjectName)"
ConfigurationType="4" ConfigurationType="4"
CharacterSet="2" CharacterSet="2"
ReferencesPath=""> ReferencesPath="">
...@@ -54,8 +54,8 @@ ...@@ -54,8 +54,8 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release|Win32" Name="Release|Win32"
OutputDirectory="Release" OutputDirectory="$(SolutionName)/$(ConfigurationName)"
IntermediateDirectory="Release" IntermediateDirectory="$(OutDir)/$(ProjectName)"
ConfigurationType="4" ConfigurationType="4"
CharacterSet="2" CharacterSet="2"
ReferencesPath="&quot;..\include&quot;;&quot;..&quot;"> ReferencesPath="&quot;..\include&quot;;&quot;..&quot;">
......
msvc/gtest_main-md.vcproj
View file @ f6dd67a1
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
<Configurations> <Configurations>
<Configuration <Configuration
Name="Debug|Win32" Name="Debug|Win32"
OutputDirectory="Debug" OutputDirectory="$(SolutionName)/$(ConfigurationName)"
IntermediateDirectory="Debug" IntermediateDirectory="$(OutDir)/$(ProjectName)"
ConfigurationType="4" ConfigurationType="4"
CharacterSet="2" CharacterSet="2"
ReferencesPath=""> ReferencesPath="">
...@@ -54,8 +54,8 @@ ...@@ -54,8 +54,8 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release|Win32" Name="Release|Win32"
OutputDirectory="Release" OutputDirectory="$(SolutionName)/$(ConfigurationName)"
IntermediateDirectory="Release" IntermediateDirectory="$(OutDir)/$(ProjectName)"
ConfigurationType="4" ConfigurationType="4"
CharacterSet="2" CharacterSet="2"
ReferencesPath="&quot;..\include&quot;;&quot;..&quot;"> ReferencesPath="&quot;..\include&quot;;&quot;..&quot;">
......
msvc/gtest_main.vcproj
View file @ f6dd67a1
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
<Configurations> <Configurations>
<Configuration <Configuration
Name="Debug|Win32" Name="Debug|Win32"
OutputDirectory="Debug" OutputDirectory="$(SolutionName)/$(ConfigurationName)"
IntermediateDirectory="Debug" IntermediateDirectory="$(OutDir)/$(ProjectName)"
ConfigurationType="4" ConfigurationType="4"
CharacterSet="2" CharacterSet="2"
ReferencesPath=""> ReferencesPath="">
...@@ -54,8 +54,8 @@ ...@@ -54,8 +54,8 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release|Win32" Name="Release|Win32"
OutputDirectory="Release" OutputDirectory="$(SolutionName)/$(ConfigurationName)"
IntermediateDirectory="Release" IntermediateDirectory="$(OutDir)/$(ProjectName)"
ConfigurationType="4" ConfigurationType="4"
CharacterSet="2" CharacterSet="2"
ReferencesPath="&quot;..\include&quot;;&quot;..&quot;"> ReferencesPath="&quot;..\include&quot;;&quot;..&quot;">
......
msvc/gtest_prod_test-md.vcproj
View file @ f6dd67a1
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
<Configurations> <Configurations>
<Configuration <Configuration
Name="Debug|Win32" Name="Debug|Win32"
OutputDirectory="Debug" OutputDirectory="$(SolutionName)/$(ConfigurationName)"
IntermediateDirectory="Debug" IntermediateDirectory="$(OutDir)/$(ProjectName)"
ConfigurationType="1" ConfigurationType="1"
CharacterSet="2"> CharacterSet="2">
<Tool <Tool
...@@ -60,8 +60,8 @@ ...@@ -60,8 +60,8 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release|Win32" Name="Release|Win32"
OutputDirectory="Release" OutputDirectory="$(SolutionName)/$(ConfigurationName)"
IntermediateDirectory="Release" IntermediateDirectory="$(OutDir)/$(ProjectName)"
ConfigurationType="1" ConfigurationType="1"
CharacterSet="2"> CharacterSet="2">
<Tool <Tool
......
msvc/gtest_prod_test.vcproj
View file @ f6dd67a1
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
<Configurations> <Configurations>
<Configuration <Configuration
Name="Debug|Win32" Name="Debug|Win32"
OutputDirectory="Debug" OutputDirectory="$(SolutionName)/$(ConfigurationName)"
IntermediateDirectory="Debug" IntermediateDirectory="$(OutDir)/$(ProjectName)"
ConfigurationType="1" ConfigurationType="1"
CharacterSet="2"> CharacterSet="2">
<Tool <Tool
...@@ -60,8 +60,8 @@ ...@@ -60,8 +60,8 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release|Win32" Name="Release|Win32"
OutputDirectory="Release" OutputDirectory="$(SolutionName)/$(ConfigurationName)"
IntermediateDirectory="Release" IntermediateDirectory="$(OutDir)/$(ProjectName)"
ConfigurationType="1" ConfigurationType="1"
CharacterSet="2"> CharacterSet="2">
<Tool <Tool
......
msvc/gtest_unittest-md.vcproj
View file @ f6dd67a1
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
<Configurations> <Configurations>
<Configuration <Configuration
Name="Debug|Win32" Name="Debug|Win32"
OutputDirectory="Debug" OutputDirectory="$(SolutionName)/$(ConfigurationName)"
IntermediateDirectory="Debug" IntermediateDirectory="$(OutDir)/$(ProjectName)"
ConfigurationType="1" ConfigurationType="1"
CharacterSet="2"> CharacterSet="2">
<Tool <Tool
...@@ -60,8 +60,8 @@ ...@@ -60,8 +60,8 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release|Win32" Name="Release|Win32"
OutputDirectory="Release" OutputDirectory="$(SolutionName)/$(ConfigurationName)"
IntermediateDirectory="Release" IntermediateDirectory="$(OutDir)/$(ProjectName)"
ConfigurationType="1" ConfigurationType="1"
CharacterSet="2"> CharacterSet="2">
<Tool <Tool
......
msvc/gtest_unittest.vcproj
View file @ f6dd67a1
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
<Configurations> <Configurations>
<Configuration <Configuration
Name="Debug|Win32" Name="Debug|Win32"
OutputDirectory="Debug" OutputDirectory="$(SolutionName)/$(ConfigurationName)"
IntermediateDirectory="Debug" IntermediateDirectory="$(OutDir)/$(ProjectName)"
ConfigurationType="1" ConfigurationType="1"
CharacterSet="2"> CharacterSet="2">
<Tool <Tool
...@@ -60,8 +60,8 @@ ...@@ -60,8 +60,8 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release|Win32" Name="Release|Win32"
OutputDirectory="Release" OutputDirectory="$(SolutionName)/$(ConfigurationName)"
IntermediateDirectory="Release" IntermediateDirectory="$(OutDir)/$(ProjectName)"
ConfigurationType="1" ConfigurationType="1"
CharacterSet="2"> CharacterSet="2">
<Tool <Tool
......
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