[Cmake-commits] CMake branch, master, updated. v3.14.0-rc4-331-g1b8c5a0

[Kitware Robot]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  1b8c5a0c35bdc8e7004a56fca356f6c917e31a15 (commit)
       via  d7c4a8ab81182ec438a444464a9f13847080d8a6 (commit)
       via  f3cedf381ec2cdeeeb01eb991d731e35978b4d24 (commit)
       via  7593bdf4e88b6a5da60e6fa9d4ba05a378d5d7d4 (commit)
      from  f74bb6527e669a02ee9f042023fcb4c9cb9f9594 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1b8c5a0c35bdc8e7004a56fca356f6c917e31a15
commit 1b8c5a0c35bdc8e7004a56fca356f6c917e31a15
Merge: d7c4a8a f3cedf3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Mar 13 14:08:23 2019 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Wed Mar 13 10:08:57 2019 -0400

    Merge topic 'revert-vs-msbuild-arch'
    
    f3cedf381e VS: Revert "Use MSBuild matching toolset host architecture"
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !3090


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d7c4a8ab81182ec438a444464a9f13847080d8a6
commit d7c4a8ab81182ec438a444464a9f13847080d8a6
Merge: f74bb65 7593bdf
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Mar 13 14:07:51 2019 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Wed Mar 13 10:08:03 2019 -0400

    Merge topic 'wix-cmake-downgrade-fix'
    
    7593bdf4e8 CMake: Fix WiX installer downgrades with versioned binaries
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !3087


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f3cedf381ec2cdeeeb01eb991d731e35978b4d24
commit f3cedf381ec2cdeeeb01eb991d731e35978b4d24
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 12 12:53:06 2019 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Mar 12 12:53:06 2019 -0400

    VS: Revert "Use MSBuild matching toolset host architecture"
    
    Revert commit da402a081b (VS: Use MSBuild matching toolset host
    architecture, 2019-01-28, v3.14.0-rc1~50^2).  Multiple people have
    reported that the 64-bit `amd64/msbuild` tool fails in cases that the
    32-bit `msbuild` works.  Drop our change pending further investigation
    and hopefully a fix to VS.
    
    Fixes: #18904, #19037
    Issue: #18219

diff --git a/Source/cmGlobalVisualStudioVersionedGenerator.cxx b/Source/cmGlobalVisualStudioVersionedGenerator.cxx
index 2f9eb3f..4d74e32 100644
--- a/Source/cmGlobalVisualStudioVersionedGenerator.cxx
+++ b/Source/cmGlobalVisualStudioVersionedGenerator.cxx
@@ -478,18 +478,6 @@ std::string cmGlobalVisualStudioVersionedGenerator::FindMSBuildCommand()
   // Ask Visual Studio Installer tool.
   std::string vs;
   if (vsSetupAPIHelper.GetVSInstanceInfo(vs)) {
-    std::string const& hostArch =
-      this->GetPlatformToolsetHostArchitectureString();
-    if (hostArch == "x64") {
-      msbuild = vs + "/MSBuild/Current/Bin/amd64/MSBuild.exe";
-      if (cmSystemTools::FileExists(msbuild)) {
-        return msbuild;
-      }
-      msbuild = vs + "/MSBuild/15.0/Bin/amd64/MSBuild.exe";
-      if (cmSystemTools::FileExists(msbuild)) {
-        return msbuild;
-      }
-    }
     msbuild = vs + "/MSBuild/Current/Bin/MSBuild.exe";
     if (cmSystemTools::FileExists(msbuild)) {
       return msbuild;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7593bdf4e88b6a5da60e6fa9d4ba05a378d5d7d4
commit 7593bdf4e88b6a5da60e6fa9d4ba05a378d5d7d4
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Tue Mar 12 08:58:45 2019 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Mar 12 09:39:35 2019 -0400

    CMake: Fix WiX installer downgrades with versioned binaries
    
    Since commit 5b9da05b7a (Windows: Embed version information into CMake
    binaries, 2017-10-25, v3.11.0-rc1~411^2) our binaries have version
    information that prevents a `.msi` downgrade from replacing them by
    default.  Configure the re-install mode:
    
    * a: reinstall all files regardless of version
    * m: rewrite all per-machine registry entries
    * u: rewrite all per-user registry entries
    * s: reinstall shortcuts and icons
    
    Fixes: #19006

diff --git a/Utilities/Release/WiX/WIX.template.in b/Utilities/Release/WiX/WIX.template.in
index fe176ca..8abf9d8 100644
--- a/Utilities/Release/WiX/WIX.template.in
+++ b/Utilities/Release/WiX/WIX.template.in
@@ -20,6 +20,8 @@
             Schedule="afterInstallInitialize"
             AllowDowngrades="yes"/>
 
+        <Property Id="REINSTALLMODE" Value="amus"/>
+
         <WixVariable Id="WixUILicenseRtf" Value="$(var.CPACK_WIX_LICENSE_RTF)"/>
         <Property Id="WIXUI_INSTALLDIR" Value="INSTALL_ROOT"/>
 

-----------------------------------------------------------------------

Summary of changes:
 Source/cmGlobalVisualStudioVersionedGenerator.cxx | 12 ------------
 Utilities/Release/WiX/WIX.template.in             |  2 ++
 2 files changed, 2 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
CMake