-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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>
- Loading branch information
Thell Fowler
committed
Dec 11, 2009
1 parent
541b826
commit 3091d7c
Showing
15 changed files
with
86 additions
and
66 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -19,6 +19,7 @@ Thumbs.db | |
| *.cache | ||
| *.ilk | ||
| *.log | ||
| msvc/vc*/ | ||
| [Bb]in | ||
| [Dd]ebug*/ | ||
| *.lib | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| <?xml version="1.0" encoding="Windows-1252"?> | ||
| <VisualStudioPropertySheet | ||
| ProjectType="Visual C++" | ||
| Version="8.00" | ||
| Name="lib_paths" | ||
| OutputDirectory="$(SolutionDir)vc8/$(ConfigurationName)" | ||
| IntermediateDirectory="$(OutDir)/$(ProjectName)" | ||
| InheritedPropertySheets=".\submodule_lib_paths.vsprops;.\environment_lib_paths.vsprops" | ||
| > | ||
| <Tool | ||
| Name="VCLibrarianTool" | ||
| AdditionalLibraryDirectories="$(ENV_LIB_PATHS);$(SM_LIB_PATHS)" | ||
| /> | ||
| <Tool | ||
| Name="VCLinkerTool" | ||
| AdditionalLibraryDirectories="$(ENV_LIB_PATHS);$(SM_LIB_PATHS)" | ||
| /> | ||
| <UserMacro | ||
| Name="ENV_LIB_PATHS" | ||
| Value=""$(envGTEST_DIR)\msvc\vc8\$(ConfigurationName)"" | ||
| PerformEnvironmentSet="true" | ||
| /> | ||
| <UserMacro | ||
| Name="SM_LIB_PATHS" | ||
| Value=""$(smGTEST_DIR)\msvc\vc8\$(ConfigurationName)\"" | ||
| PerformEnvironmentSet="true" | ||
| /> | ||
| </VisualStudioPropertySheet> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| <?xml version="1.0" encoding="Windows-1252"?> | ||
| <VisualStudioPropertySheet | ||
| ProjectType="Visual C++" | ||
| Version="8.00" | ||
| Name="lib_paths" | ||
| OutputDirectory="$(SolutionDir)vc9/$(ConfigurationName)" | ||
| IntermediateDirectory="$(OutDir)/$(ProjectName)" | ||
| InheritedPropertySheets=".\submodule_lib_paths.vsprops;.\environment_lib_paths.vsprops" | ||
| > | ||
| <Tool | ||
| Name="VCLibrarianTool" | ||
| AdditionalLibraryDirectories="$(ENV_LIB_PATHS);$(SM_LIB_PATHS)" | ||
| /> | ||
| <Tool | ||
| Name="VCLinkerTool" | ||
| AdditionalLibraryDirectories="$(ENV_LIB_PATHS);$(SM_LIB_PATHS)" | ||
| /> | ||
| <UserMacro | ||
| Name="ENV_LIB_PATHS" | ||
| Value=""$(envGTEST_DIR)\msvc\vc9\$(ConfigurationName)"" | ||
| PerformEnvironmentSet="true" | ||
| /> | ||
| <UserMacro | ||
| Name="SM_LIB_PATHS" | ||
| Value=""$(smGTEST_DIR)\msvc\vc9\$(ConfigurationName)\"" | ||
| PerformEnvironmentSet="true" | ||
| /> | ||
| </VisualStudioPropertySheet> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters