-
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.
Merge branch 'tf/nppcr-project-files-overhaul'
* This merge commit was amended to also update the submodule tags: google_test to tag v1.3.0.3 google_mock to tag v1.1.0.3 * tf/nppcr-project-files-overhaul: .gitmodules: use google test/mock 'next' branch project files: remove remaining GTEST_DIR macro project files: update VC8 project files project files: update VC9 project files vsprops: make environment and default path values valid vsprops: Dependency on Google [Mock|Test] is now dependant on an env var. vc8 solution: make release config use release build [#5 state:resolved] Signed-off-by: Thell Fowler <git@tbfowler.name>
- Loading branch information
Showing
16 changed files
with
152 additions
and
722 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 |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| <?xml version="1.0" encoding="Windows-1252"?> | ||
| <VisualStudioPropertySheet | ||
| ProjectType="Visual C++" | ||
| Version="8.00" | ||
| Name="environment_lib_paths" | ||
| > | ||
| <Tool | ||
| Name="VCCLCompilerTool" | ||
| AdditionalIncludeDirectories=""$(envGTEST_DIR)\include";"$(envGMOCK_DIR)\include"" | ||
| /> | ||
| <Tool | ||
| Name="VCLinkerTool" | ||
| AdditionalLibraryDirectories=""$(envGTEST_DIR)\msvc\$(ConfigurationName)";"$(envGMOCK_DIR)\msvc\$(ConfigurationName)"" | ||
| /> | ||
| <UserMacro | ||
| Name="envGTEST_DIR" | ||
| Value="$(GOOGLE_TEST_DIR)" | ||
| /> | ||
| <UserMacro | ||
| Name="envGMOCK_DIR" | ||
| Value="$(GOOGLE_MOCK_DIR)" | ||
| /> | ||
| </VisualStudioPropertySheet> |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
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,23 @@ | ||
| <?xml version="1.0" encoding="Windows-1252"?> | ||
| <VisualStudioPropertySheet | ||
| ProjectType="Visual C++" | ||
| Version="8.00" | ||
| Name="submodule_lib_paths" | ||
| > | ||
| <Tool | ||
| Name="VCCLCompilerTool" | ||
| AdditionalIncludeDirectories=""$(smGTEST_DIR)\include";"$(smGMOCK_DIR)\include"" | ||
| /> | ||
| <Tool | ||
| Name="VCLinkerTool" | ||
| AdditionalLibraryDirectories=""$(smGTEST_DIR)\msvc\$(ConfigurationName)";"$(smGMOCK_DIR)\msvc\$(ConfigurationName)"" | ||
| /> | ||
| <UserMacro | ||
| Name="smGMOCK_DIR" | ||
| Value="$(SolutionDir)google_mock" | ||
| /> | ||
| <UserMacro | ||
| Name="smGTEST_DIR" | ||
| Value="$(SolutionDir)google_test" | ||
| /> | ||
| </VisualStudioPropertySheet> |
Oops, something went wrong.