project files: make vc8 and 9 libs side-by-side

- Allowing the different vc version to be built and live side-by-side makes for easier testing by developers using multiple vc compilers. This change makes mock recognize the vc8 and 9 paths of google test as well as place the mock binaries in a appropriate path. [#2] Signed-off-by: Thell Fowler <git@tbfowler.name>
npp-community · Dec 11, 2009 · ebcd79c · ebcd79c
1 parent 1960fdf
commit ebcd79c
Show file tree

Hide file tree

Showing 21 changed files with 69 additions and 89 deletions.
diff --git a/.gitignore b/.gitignore
@@ -19,6 +19,7 @@ Thumbs.db
 *.cache
 *.ilk
 *.log
+msvc/vc*/
 [Bb]in
 [Dd]ebug*/
 *.lib

diff --git a/msvc/N++CR.8.vsprops b/msvc/N++CR.8.vsprops
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="N++CR"
+	OutputDirectory="$(SolutionDir)vc8/$(ConfigurationName)"
+	IntermediateDirectory="$(SolutionDir)vc8/$(ConfigurationName)/$(ProjectName)"
+	BuildLogFile="$(IntDir)\$(TargetName)_Buildlog.htm"
+	>
+	<Tool
+		Name="VCCLCompilerTool"
+		ProgramDataBaseFileName="$(IntDir)\vc80.pdb"
+	/>
+</VisualStudioPropertySheet>
diff --git a/msvc/N++CR.vsprops → msvc/N++CR.9.vsprops b/msvc/N++CR.vsprops → msvc/N++CR.9.vsprops
@@ -3,7 +3,8 @@
 	ProjectType="Visual C++"
 	Version="8.00"
 	Name="N++CR"
-	IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+	OutputDirectory="$(SolutionDir)vc9/$(ConfigurationName)"
+	IntermediateDirectory="$(SolutionDir)vc9/$(ConfigurationName)/$(ProjectName)"
 	BuildLogFile="$(IntDir)\$(TargetName)_Buildlog.htm"
 	>
 	<Tool

diff --git a/msvc/gtest.8.vcproj b/msvc/gtest.8.vcproj
@@ -16,9 +16,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="Debug"
 			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;.\N++CR.vsprops"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;.\N++CR.8.vsprops"
 			CharacterSet="2"
 			>
 			<Tool
@@ -78,9 +77,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="Release"
 			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;.\N++CR.vsprops"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;.\N++CR.8.vsprops"
 			CharacterSet="2"
 			>
 			<Tool

diff --git a/msvc/gtest.9.vcproj b/msvc/gtest.9.vcproj
@@ -18,9 +18,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="Debug"
 			ConfigurationType="4"
-			InheritedPropertySheets=".\N++CR.vsprops"
+			InheritedPropertySheets=".\N++CR.9.vsprops"
 			CharacterSet="2"
 			>
 			<Tool
@@ -82,9 +81,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="Release"
 			ConfigurationType="4"
-			InheritedPropertySheets=".\N++CR.vsprops"
+			InheritedPropertySheets=".\N++CR.9.vsprops"
 			CharacterSet="2"
 			>
 			<Tool

diff --git a/msvc/gtest_color_test_.8.vcproj b/msvc/gtest_color_test_.8.vcproj
@@ -16,9 +16,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="Debug"
 			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;.\N++CR.vsprops"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;.\N++CR.8.vsprops"
 			CharacterSet="2"
 			>
 			<Tool
@@ -92,9 +91,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="Release"
 			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;.\N++CR.vsprops"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;.\N++CR.8.vsprops"
 			CharacterSet="2"
 			>
 			<Tool
@@ -168,7 +166,7 @@
 	<References>
 		<ProjectReference
 			ReferencedProjectIdentifier="{C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}"
-			RelativePathToProject=".\gtest.vcproj"
+			RelativePathToProject=".\gtest.8.vcproj"
 		/>
 	</References>
 	<Files>

diff --git a/msvc/gtest_color_test_.9.vcproj b/msvc/gtest_color_test_.9.vcproj
@@ -18,9 +18,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="Debug"
 			ConfigurationType="1"
-			InheritedPropertySheets=".\N++CR.vsprops"
+			InheritedPropertySheets=".\N++CR.9.vsprops"
 			CharacterSet="2"
 			>
 			<Tool
@@ -94,9 +93,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="Release"
 			ConfigurationType="1"
-			InheritedPropertySheets=".\N++CR.vsprops"
+			InheritedPropertySheets=".\N++CR.9.vsprops"
 			CharacterSet="2"
 			>
 			<Tool
@@ -170,7 +168,7 @@
 	<References>
 		<ProjectReference
 			ReferencedProjectIdentifier="{C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}"
-			RelativePathToProject=".\gtest.vc.9.0.vcproj"
+			RelativePathToProject=".\gtest.9.vcproj"
 		/>
 	</References>
 	<Files>

diff --git a/msvc/gtest_env_var_test_.8.vcproj b/msvc/gtest_env_var_test_.8.vcproj
@@ -16,9 +16,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="Debug"
 			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;.\N++CR.vsprops"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;.\N++CR.8.vsprops"
 			CharacterSet="2"
 			>
 			<Tool
@@ -92,9 +91,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="Release"
 			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;.\N++CR.vsprops"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;.\N++CR.8.vsprops"
 			CharacterSet="2"
 			>
 			<Tool
@@ -168,7 +166,7 @@
 	<References>
 		<ProjectReference
 			ReferencedProjectIdentifier="{C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}"
-			RelativePathToProject=".\gtest.vcproj"
+			RelativePathToProject=".\gtest.8.vcproj"
 		/>
 	</References>
 	<Files>

diff --git a/msvc/gtest_env_var_test_.9.vcproj b/msvc/gtest_env_var_test_.9.vcproj
@@ -18,9 +18,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="Debug"
 			ConfigurationType="1"
-			InheritedPropertySheets=".\N++CR.vsprops"
+			InheritedPropertySheets=".\N++CR.9.vsprops"
 			CharacterSet="2"
 			>
 			<Tool
@@ -94,9 +93,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="Release"
 			ConfigurationType="1"
-			InheritedPropertySheets=".\N++CR.vsprops"
+			InheritedPropertySheets=".\N++CR.9.vsprops"
 			CharacterSet="2"
 			>
 			<Tool
@@ -170,7 +168,7 @@
 	<References>
 		<ProjectReference
 			ReferencedProjectIdentifier="{C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}"
-			RelativePathToProject=".\gtest.vc.9.0.vcproj"
+			RelativePathToProject=".\gtest.9.vcproj"
 		/>
 	</References>
 	<Files>

diff --git a/msvc/gtest_environment_test.8.vcproj b/msvc/gtest_environment_test.8.vcproj
@@ -16,9 +16,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="Debug"
 			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;.\N++CR.vsprops"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;.\N++CR.8.vsprops"
 			CharacterSet="2"
 			>
 			<Tool
@@ -92,9 +91,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="Release"
 			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;.\N++CR.vsprops"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;.\N++CR.8.vsprops"
 			CharacterSet="2"
 			>
 			<Tool
@@ -168,7 +166,7 @@
 	<References>
 		<ProjectReference
 			ReferencedProjectIdentifier="{C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}"
-			RelativePathToProject=".\gtest.vcproj"
+			RelativePathToProject=".\gtest.8.vcproj"
 		/>
 	</References>
 	<Files>

diff --git a/msvc/gtest_environment_test.9.vcproj b/msvc/gtest_environment_test.9.vcproj
@@ -18,9 +18,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="Debug"
 			ConfigurationType="1"
-			InheritedPropertySheets=".\N++CR.vsprops"
+			InheritedPropertySheets=".\N++CR.9.vsprops"
 			CharacterSet="2"
 			>
 			<Tool
@@ -94,9 +93,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="Release"
 			ConfigurationType="1"
-			InheritedPropertySheets=".\N++CR.vsprops"
+			InheritedPropertySheets=".\N++CR.9.vsprops"
 			CharacterSet="2"
 			>
 			<Tool
@@ -170,7 +168,7 @@
 	<References>
 		<ProjectReference
 			ReferencedProjectIdentifier="{C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}"
-			RelativePathToProject=".\gtest.vc.9.0.vcproj"
+			RelativePathToProject=".\gtest.9.vcproj"
 		/>
 	</References>
 	<Files>

diff --git a/msvc/gtest_main.8.vcproj b/msvc/gtest_main.8.vcproj
@@ -16,9 +16,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="Debug"
 			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;.\N++CR.vsprops"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;.\N++CR.8.vsprops"
 			CharacterSet="2"
 			>
 			<Tool
@@ -78,9 +77,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="Release"
 			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;.\N++CR.vsprops"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;.\N++CR.8.vsprops"
 			CharacterSet="2"
 			>
 			<Tool
@@ -139,7 +137,7 @@
 	<References>
 		<ProjectReference
 			ReferencedProjectIdentifier="{C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}"
-			RelativePathToProject=".\gtest.vcproj"
+			RelativePathToProject=".\gtest.8.vcproj"
 		/>
 	</References>
 	<Files>

diff --git a/msvc/gtest_main.9.vcproj b/msvc/gtest_main.9.vcproj
@@ -18,9 +18,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="Debug"
 			ConfigurationType="4"
-			InheritedPropertySheets=".\N++CR.vsprops"
+			InheritedPropertySheets=".\N++CR.9.vsprops"
 			CharacterSet="2"
 			>
 			<Tool
@@ -81,9 +80,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="Release"
 			ConfigurationType="4"
-			InheritedPropertySheets=".\N++CR.vsprops"
+			InheritedPropertySheets=".\N++CR.9.vsprops"
 			CharacterSet="2"
 			>
 			<Tool
@@ -143,7 +141,7 @@
 	<References>
 		<ProjectReference
 			ReferencedProjectIdentifier="{C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}"
-			RelativePathToProject=".\gtest.vc.9.0.vcproj"
+			RelativePathToProject=".\gtest.9.vcproj"
 		/>
 	</References>
 	<Files>

diff --git a/msvc/gtest_output_test_.8.vcproj b/msvc/gtest_output_test_.8.vcproj
@@ -16,9 +16,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="Debug"
 			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;.\N++CR.vsprops"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;.\N++CR.8.vsprops"
 			CharacterSet="2"
 			>
 			<Tool
@@ -92,9 +91,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="Release"
 			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;.\N++CR.vsprops"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;.\N++CR.8.vsprops"
 			CharacterSet="2"
 			>
 			<Tool
@@ -168,7 +166,7 @@
 	<References>
 		<ProjectReference
 			ReferencedProjectIdentifier="{C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}"
-			RelativePathToProject=".\gtest.vcproj"
+			RelativePathToProject=".\gtest.8.vcproj"
 		/>
 	</References>
 	<Files>

diff --git a/msvc/gtest_output_test_.9.vcproj b/msvc/gtest_output_test_.9.vcproj
@@ -18,9 +18,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="Debug"
 			ConfigurationType="1"
-			InheritedPropertySheets=".\N++CR.vsprops"
+			InheritedPropertySheets=".\N++CR.9.vsprops"
 			CharacterSet="2"
 			>
 			<Tool
@@ -94,9 +93,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="Release"
 			ConfigurationType="1"
-			InheritedPropertySheets=".\N++CR.vsprops"
+			InheritedPropertySheets=".\N++CR.9.vsprops"
 			CharacterSet="2"
 			>
 			<Tool
@@ -170,7 +168,7 @@
 	<References>
 		<ProjectReference
 			ReferencedProjectIdentifier="{C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}"
-			RelativePathToProject=".\gtest.vc.9.0.vcproj"
+			RelativePathToProject=".\gtest.9.vcproj"
 		/>
 	</References>
 	<Files>