[cpp-msbuild] 13/13: SSPCPP-765 MSCPP Merge Modules from the 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=cda42d6c923b09453a4ffc34ec1ab66f142f6a6a

commit cda42d6c923b09453a4ffc34ec1ab66f142f6a6a
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sun Dec 10 16:29:11 2017 -0500

    SSPCPP-765 MSCPP Merge Modules from the environment
    
    https://issues.shibboleth.net/jira/browse/SSPCPP-765
---
 Versions.props          |  3 ++-
 dependencies/config.bat | 17 +++++++++--------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/Versions.props b/Versions.props
index 4d6b4dc..0f5b981 100644
--- a/Versions.props
+++ b/Versions.props
@@ -5,7 +5,8 @@
 
     <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.11.25325\MergeModules</CppMmDir>
+    <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>
diff --git a/dependencies/config.bat b/dependencies/config.bat
index def125e..9b8ece3 100644
--- a/dependencies/config.bat
+++ b/dependencies/config.bat
@@ -7,7 +7,7 @@ if "%1" NEQ "" goto %1%
 #
 
 set ROOT_DIR=C:\Users\cantor.2\Shibboleth\
-set VS_DIR=C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build
+set CPP_MM_DIR=C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Redist\MSVC\14.11.25325\MergeModules
 set SED=C:\cygwin64\bin\sed.exe
 
 
@@ -25,34 +25,35 @@ goto path_done
 
 :ROD
 set ROOT_DIR=H:\Perforce\VS2017\
-set VS_DIR=d:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Auxiliary\Build\
 set SED=sed
+set CPP_MM_DIR=D:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Redist\MSVC\14.11.25325\MergeModules
 
 ##
 ## Apache Config
 ##
 SET APACHE_13_ROOT=%ROOT_DIR%apache\VC10\Apache
-SET APACHE_20_ROOT=%ROOT_DIR%apache\VC10\Apache2.0.63\Apache
+SET APACHE_20_ROOT=%ROOT_DIR%apache\VC10\Apache2.0.63\Apache2
 SET APACHE_22_ROOT=%ROOT_DIR%apache\VC10\Apache2
 SET APACHE_22_ROOT64=%ROOT_DIR%apache\VC10\Apache22-64
-SET APACHE_24_ROOT=%ROOT_DIR%apache\VC10\Apache24
-SET APACHE_24_ROOT64=%ROOT_DIR%apache\VC10\Apache24-64
+SET APACHE_24_ROOT=%ROOT_DIR%apache\VC15\Apache24-32\Apache24
+SET APACHE_24_ROOT64=%ROOT_DIR%apache\VC15\Apache24-64\Apache24
 goto path_done
 
 :ROD_LAPTOP
 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
 
 ##
 ## Apache Config
 ##
 SET APACHE_13_ROOT=%ROOT_DIR%apache\VC10\Apache
-SET APACHE_20_ROOT=%ROOT_DIR%apache\VC10\Apache2.0.63\Apache
+SET APACHE_20_ROOT=%ROOT_DIR%apache\VC10\Apache2.0.63\Apache2
 SET APACHE_22_ROOT=%ROOT_DIR%apache\VC10\Apache2
 SET APACHE_22_ROOT64=%ROOT_DIR%apache\VC10\Apache22-64
-SET APACHE_24_ROOT=%ROOT_DIR%apache\VC10\Apache24
-SET APACHE_24_ROOT64=%ROOT_DIR%apache\VC10\Apache24-64
+SET APACHE_24_ROOT=%ROOT_DIR%apache\VC15\Apache24-32\Apache24
+SET APACHE_24_ROOT64=%ROOT_DIR%apache\VC15\Apache24-64\Apache24
 goto path_done
 
 :path_done

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