[Cmake-commits] CMake branch, master, updated. v3.11.1-709-g42db369

[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  42db369133d4cfc0e47bb624b2a08e57fee097a5 (commit)
       via  5cc195f1f4a7630b7ee54dfe9c2761cb5ee2a8e0 (commit)
      from  7489d9cb241f199471499e0952a13ea48fec1f9e (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=42db369133d4cfc0e47bb624b2a08e57fee097a5
commit 42db369133d4cfc0e47bb624b2a08e57fee097a5
Merge: 7489d9c 5cc195f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon May 7 13:18:52 2018 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon May 7 09:19:07 2018 -0400

    Merge topic 'vs-cert'
    
    5cc195f1f4 VS Generator: Only include default certificate if it was actually copied
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !2034


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5cc195f1f4a7630b7ee54dfe9c2761cb5ee2a8e0
commit 5cc195f1f4a7630b7ee54dfe9c2761cb5ee2a8e0
Author:     Mark Ingram <mingram at serif.com>
AuthorDate: Fri May 4 11:17:56 2018 +0100
Commit:     Mark Ingram <mingram at serif.com>
CommitDate: Fri May 4 18:10:10 2018 +0100

    VS Generator: Only include default certificate if it was actually copied

diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 7a7c647..2e8a2eb 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -3964,6 +3964,7 @@ void cmVisualStudio10TargetGenerator::WriteWinRTPackageCertificateKeyFile(
                                  pfxFile, false);
         ConvertToWindowsSlash(pfxFile);
         this->AddedFiles.push_back(pfxFile);
+        this->AddedDefaultCertificate = true;
       }
 
       e1.Element("PackageCertificateKeyFile", pfxFile);
@@ -4530,10 +4531,13 @@ void cmVisualStudio10TargetGenerator::WriteCommonMissingFiles(
   Elem(e1, "Image").Attribute("Include", splashScreen).EndElement();
   this->AddedFiles.push_back(splashScreen);
 
-  // This file has already been added to the build so don't copy it
-  std::string keyFile = this->DefaultArtifactDir + "/Windows_TemporaryKey.pfx";
-  ConvertToWindowsSlash(keyFile);
-  Elem(e1, "None").Attribute("Include", keyFile).EndElement();
+  if (this->AddedDefaultCertificate) {
+    // This file has already been added to the build so don't copy it
+    std::string keyFile =
+      this->DefaultArtifactDir + "/Windows_TemporaryKey.pfx";
+    ConvertToWindowsSlash(keyFile);
+    Elem(e1, "None").Attribute("Include", keyFile).EndElement();
+  }
 }
 
 bool cmVisualStudio10TargetGenerator::ForceOld(const std::string& source) const
diff --git a/Source/cmVisualStudio10TargetGenerator.h b/Source/cmVisualStudio10TargetGenerator.h
index f6c5a64..ecf19d7 100644
--- a/Source/cmVisualStudio10TargetGenerator.h
+++ b/Source/cmVisualStudio10TargetGenerator.h
@@ -219,6 +219,7 @@ private:
   bool IsMissingFiles;
   std::vector<std::string> AddedFiles;
   std::string DefaultArtifactDir;
+  bool AddedDefaultCertificate = false;
   // managed C++/C# relevant members
   typedef std::pair<std::string, std::string> DotNetHintReference;
   typedef std::vector<DotNetHintReference> DotNetHintReferenceList;

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

Summary of changes:
 Source/cmVisualStudio10TargetGenerator.cxx |   12 ++++++++----
 Source/cmVisualStudio10TargetGenerator.h   |    1 +
 2 files changed, 9 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake