CPPXT-106 XMLTOOLING gains per VC version build tools

[shibboleth/cpp-sp.git] / msi / WiX / MergeModules / OpenSAML-x86.wxs

diff --git a/msi/WiX/MergeModules/OpenSAML-x86.wxs b/msi/WiX/MergeModules/OpenSAML-x86.wxs
index 07c702c..f3c45ef 100644 (file)
--- a/msi/WiX/MergeModules/OpenSAML-x86.wxs
+++ b/msi/WiX/MergeModules/OpenSAML-x86.wxs
@@ -34,10 +34,10 @@
                 <File KeyPath='yes' Checksum='yes' Name='samlsign.exe' />
               </Component>
               <Component Id='xmltooling.dll' Guid='$(var.XMLToolingComponent32)'>
-                <File KeyPath='yes' Checksum='yes' Source='$(var.SPBuildDirectory)\cpp-xmltooling\Release\xmltooling$(var.XmlToolingFileVersion).dll' />
+                <File KeyPath='yes' Checksum='yes' Source='$(var.SPBuildDirectory)\cpp-xmltooling\Build\$(var.ShibbolethMsVersion)\x64\Release\xmltooling$(var.XmlToolingFileVersion).dll' />
               </Component>
               <Component Id='xmltooling_lite.dll' Guid='$(var.XMLToolingLiteComponent32)'>
-                <File KeyPath='yes' Checksum='yes' Source='$(var.SPBuildDirectory)\cpp-xmltooling\Release\xmltooling-lite$(var.XmlToolingFileVersion).dll' />
+                <File KeyPath='yes' Checksum='yes' Source='$(var.SPBuildDirectory)\cpp-xmltooling\Build\$(var.ShibbolethMsVersion)\x64\Release\xmltooling-lite$(var.XmlToolingFileVersion).dll' />
               </Component>
               <Directory Id='lib_debug' Name='debug' FileSource='$(var.SPBuildDirectory)\cpp-opensaml\Debug\'>
                 <Component Id='samlD.dll' Guid='$(var.SamlComponent32d)'>
@@ -48,11 +48,11 @@
                 </Component>
                 <Component Id='xmltoolingD.dll' Guid='$(var.XMLToolingComponent32d)'>
                   <File KeyPath='yes' Checksum='yes'
-                    Source='$(var.SPBuildDirectory)\cpp-xmltooling\Debug\xmltooling$(var.XmlToolingFileVersion)D.dll' />
+                    Source='$(var.SPBuildDirectory)\cpp-xmltooling\Build\$(var.ShibbolethMsVersion)\x64\Debug\xmltooling$(var.XmlToolingFileVersion)D.dll' />
                 </Component>
                 <Component Id='xmltooling_liteD.dll' Guid='$(var.XMLToolingLiteComponent32d)'>
                   <File KeyPath='yes' Checksum='yes'
-                    Source='$(var.SPBuildDirectory)\cpp-xmltooling\Debug\xmltooling-lite$(var.XmlToolingFileVersion)D.dll' />
+                    Source='$(var.SPBuildDirectory)\cpp-xmltooling\Build\$(var.ShibbolethMsVersion)\x64\Debug\xmltooling-lite$(var.XmlToolingFileVersion)D.dll' />
                 </Component>
               </Directory><!-- lib_debug -->
             </Directory><!-- lib -->