[cpp-msbuild] 03/03: SSPCPP-689 Add explicit location for MergeModule dir

[Rod Widdowson]

This is an automated email from the git hooks/post-receive script.

rdw pushed a commit to branch master
in repository cpp-msbuild.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-msbuild.git;a=commit;h=a25506c1160d5df48d39b12fe29834613d4053ec

commit a25506c1160d5df48d39b12fe29834613d4053ec
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Tue Sep 5 15:54:21 2017 +0100

    SSPCPP-689 Add explicit location for MergeModule dir
    
    https://issues.shibboleth.net/jira/browse/SSPCPP-689
    
    During a VC15 install they no longer put into the common place
    because doing a one off analysis of your dependencies and checking
    they are OK is deprecated and you have to trust Microsoft.
---
 Versions.props | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Versions.props b/Versions.props
index e79f792..45dbbdf 100644
--- a/Versions.props
+++ b/Versions.props
@@ -2,6 +2,8 @@
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Label="VersionMacros">
     <MsVCVersion>vc15</MsVCVersion>
+    <!-- NO TRAILING '\' for the following.  Default value is C:\Program Files (x86)\Common Files\Merge Modules -->
+    <CppMmDir>D:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Redist\MSVC\14.10.25008\MergeModules</CppMmDir>
 
     <CxxTestRoot>$(BuildRoot)\cxxtest</CxxTestRoot>
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.