[cpp-msbuild] branch master updated: SSPCPP-808 Inherit Merge directory folder from environment

[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=4fe09dd043c3d0d69be6c6a679e2320222b1aaac

The following commit(s) were added to refs/heads/master by this push:
       new  4fe09dd   SSPCPP-808 Inherit Merge directory folder from environment
4fe09dd is described below

commit 4fe09dd043c3d0d69be6c6a679e2320222b1aaac
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Wed Oct 17 14:58:32 2018 +0100

    SSPCPP-808 Inherit Merge directory folder from environment
    
    https://issues.shibboleth.net/jira/browse/SSPCPP-808
---
 Versions.props          | 11 +++++++++--
 dependencies/config.bat | 13 +++++++++----
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/Versions.props b/Versions.props
index b704cc5..c0c1d23 100644
--- a/Versions.props
+++ b/Versions.props
@@ -5,8 +5,7 @@
 
     <MsVCVersion>vc15</MsVCVersion>
     <!-- NO TRAILING '\' for the following.  Default value is C:\Program Files (x86)\Common Files\Merge Modules -->
-    <CppMmDir Condition="'$(CPP_MM_DIR))'==''">d:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Redist\MSVC\14.11.25325\MergeModules</CppMmDir>
-    <CppMmDir Condition="'$(CPP_MM_DIR)'!=''">$(CPP_MM_DIR)</CppMmDir>
+
     <CppVCVersion>VC141</CppVCVersion>
 
     <CxxTestRoot>$(BuildRoot)\cxxtest</CxxTestRoot>
@@ -77,6 +76,14 @@
 
   </PropertyGroup>
 
+  <PropertyGroup Label="ManualMMDir" Condition="'$(VCToolsRedistDir)' == ''">
+    <CppMmDir Condition="'$(CPP_MM_DIR))'==''">d:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Redist\MSVC\14.11.25325\MergeModules</CppMmDir>
+    <CppMmDir Condition="'$(CPP_MM_DIR)'!=''">$(CPP_MM_DIR)</CppMmDir>
+  </PropertyGroup>
+  <PropertyGroup Label="ManualMMDir" Condition="'$(VCToolsRedistDir)' != ''">
+    <CppMmDir>$(VCToolsRedistDir)MergeModules</CppMmDir>
+  </PropertyGroup>
+
   <PropertyGroup Label="CurlGuidsBad" Condition="'$(LIBCURL_FILE_VERSION)' != '7'">
     <CurlFileVersion>BAD_LIBCURL_FILE_VERSION</CurlFileVersion>
     <!-- Changing LIBCURL_FILE_VERSION version requires changing the GUIDs since it is garnish on the name -->
diff --git a/dependencies/config.bat b/dependencies/config.bat
index 3438fce..d50a994 100644
--- a/dependencies/config.bat
+++ b/dependencies/config.bat
@@ -8,7 +8,9 @@ REM DEFAULT SETTINGS (for Scott)
 REM
 
 set ROOT_DIR=C:\Users\scantor\Shibboleth\
-set CPP_MM_DIR=C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.14.26405\MergeModules
+
+REM CPP_MM_DIR need not be set if vcvars is called prior to loading Visual studio or running msbuild
+rem set CPP_MM_DIR=C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.14.26405\MergeModules
 set SED=C:\cygwin64\bin\sed.exe
 rem set DEBUG_INSTALLER=YES
 
@@ -27,7 +29,8 @@ goto path_done
 :BUILDVM
 
 set ROOT_DIR=C:\Users\Administrator\Shibboleth\
-set CPP_MM_DIR=C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.14.26405\MergeModules
+REM CPP_MM_DIR need not be set if vcvars is called prior to loading Visual studio or running msbuild
+rem set CPP_MM_DIR=C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.14.26405\MergeModules
 set SED="C:\Program Files\Git\usr\bin\sed.exe"
 rem set DEBUG_INSTALLER=YES
 
@@ -46,7 +49,8 @@ goto path_done
 :ROD
 set ROOT_DIR=H:\Perforce\VS2017\
 set SED=sed
-set CPP_MM_DIR=D:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Redist\MSVC\14.14.26405\MergeModules
+REM CPP_MM_DIR need not be set if vcvars is called prior to loading Visual studio or running msbuild
+rem set CPP_MM_DIR=D:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Redist\MSVC\14.14.26405\MergeModules
 set DEBUG_INSTALLER=YES
 
 
@@ -65,7 +69,8 @@ goto path_done
 set ROOT_DIR=H:\Perforce\VS2017\
 set SED=D:\downloads\cygwin\bin\sed.exe
 set PERL=C:\Strawberry\perl\bin\perl.exe
-set CPP_MM_DIR=C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Redist\MSVC\14.11.25325\MergeModules
+REM CPP_MM_DIR need not be set if vcvars is called prior to loading Visual studio or running msbuild
+rem set CPP_MM_DIR=C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Redist\MSVC\14.11.25325\MergeModules
 
 REM
 REM Apache Config

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