-
Notifications
You must be signed in to change notification settings - Fork 16
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 use of side-by-side google libs
- Alters the vc8 and 9 project files to use vc version designated paths of google test and mock. [#19] Signed-off-by: Thell Fowler <git@tbfowler.name>
- Loading branch information
Thell Fowler
committed
Jan 19, 2010
1 parent
32b9c6f
commit 68e6dee
Showing
8 changed files
with
58 additions
and
14 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
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,26 @@ | ||
| <?xml version="1.0" encoding="Windows-1252"?> | ||
| <VisualStudioPropertySheet | ||
| ProjectType="Visual C++" | ||
| Version="8.00" | ||
| Name="lib_paths" | ||
| 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="SM_LIB_PATHS" | ||
| Value=""$(smGTEST_DIR)\msvc\vc8\$(ConfigurationName)";"$(smGMOCK_DIR)\msvc\vc8\$(ConfigurationName)"" | ||
| PerformEnvironmentSet="true" | ||
| /> | ||
| <UserMacro | ||
| Name="ENV_LIB_PATHS" | ||
| Value=""$(envGTEST_DIR)\msvc\vc8\$(ConfigurationName)";"$(envGMOCK_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,26 @@ | ||
| <?xml version="1.0" encoding="Windows-1252"?> | ||
| <VisualStudioPropertySheet | ||
| ProjectType="Visual C++" | ||
| Version="8.00" | ||
| Name="lib_paths" | ||
| 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="SM_LIB_PATHS" | ||
| Value=""$(smGTEST_DIR)\msvc\vc9\$(ConfigurationName)";"$(smGMOCK_DIR)\msvc\vc9\$(ConfigurationName)"" | ||
| PerformEnvironmentSet="true" | ||
| /> | ||
| <UserMacro | ||
| Name="ENV_LIB_PATHS" | ||
| Value=""$(envGTEST_DIR)\msvc\vc9\$(ConfigurationName)";"$(envGMOCK_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
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
Submodule google_mock
updated
15 files
| +1 −0 | .gitignore | |
| +1 −1 | msvc/environment_lib_paths.vsprops | |
| +4 −6 | msvc/gmock.8.vcproj | |
| +3 −6 | msvc/gmock.9.vcproj | |
| +2 −6 | msvc/gmock_link_test.8.vcproj | |
| +3 −7 | msvc/gmock_link_test.9.vcproj | |
| +2 −6 | msvc/gmock_main.8.vcproj | |
| +3 −7 | msvc/gmock_main.9.vcproj | |
| +2 −6 | msvc/gmock_output_test_.8.vcproj | |
| +3 −7 | msvc/gmock_output_test_.9.vcproj | |
| +2 −6 | msvc/gmock_test.8.vcproj | |
| +3 −7 | msvc/gmock_test.9.vcproj | |
| +28 −0 | msvc/lib_paths.8.vsprops | |
| +28 −0 | msvc/lib_paths.9.vsprops | |
| +1 −1 | msvc/submodule_lib_paths.vsprops |
Submodule google_test
updated
21 files