Updated for 2.5 fileset plus various cleanups

[shibboleth/sp.git] / msi / WiX / MergeModules / Xerces-x64.wxs

diff --git a/msi/WiX/MergeModules/Xerces-x64.wxs b/msi/WiX/MergeModules/Xerces-x64.wxs
index 8ac8463..e3893f5 100644 (file)
--- a/msi/WiX/MergeModules/Xerces-x64.wxs
+++ b/msi/WiX/MergeModules/Xerces-x64.wxs
@@ -27,15 +27,14 @@
       <Directory Id='ProgramFiles64Folder' Name='ProgramFiles'>\r
         <Directory Id='shibboleth' Name='Shibboleth'>\r
           <Directory Id='shibboleth_sp' Name='SP'>\r
-            \r
             <Directory Id='lib' Name='lib'>\r
               <Component Id='xercesc.dll' Guid='{5C2BA2C6-36EC-4EB3-A343-8C1C9D499B9C}' Win64='yes'>\r
-                <File Id='xercesc.dll' KeyPath='yes'\r
+                <File KeyPath='yes' Checksum='yes'\r
                       Source='$(var.BuildDirectory)\xerces-c-$(var.XercesVersion)-x86_64-windows-vc-10.0\bin\xerces-c_$(var.XercesFileVersion).dll'/>\r
               </Component>\r
               <Directory Id='lib_debug' Name='debug'>\r
                 <Component Id='xercescD.dll' Guid='{236B6A7F-73C0-4EBF-9C06-90C1BE160ACE}' Win64='yes'>\r
-                  <File Id='xercescD.dll' KeyPath='yes'\r
+                  <File KeyPath='yes' Checksum='yes'\r
                         Source='$(var.BuildDirectory)\xerces-c-$(var.XercesVersion)-x86_64-windows-vc-10.0\bin\xerces-c_$(var.XercesFileVersion)D.dll'/>\r
                 </Component>\r
               </Directory><!-- lib_debug-->\r
@@ -52,5 +51,3 @@
     </Directory><!-- TARGETDIR -->\r
   </Module>\r
 </Wix>\r
-\r
-    \r