[Cmake-commits] CMake branch, next, updated. v3.0.1-5060-ge210e5a

[Brad King]

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, next has been updated
       via  e210e5ac17af28e1066f155851a280d893c4eee1 (commit)
       via  86453930a6c8e3fe1416e8147c201fdebece8f4f (commit)
      from  98f69986160c9fd2788403e045b97c31d201d7b2 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e210e5ac17af28e1066f155851a280d893c4eee1
commit e210e5ac17af28e1066f155851a280d893c4eee1
Merge: 98f6998 8645393
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Aug 27 11:25:53 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Aug 27 11:25:53 2014 -0400

    Merge topic 'vs-windows-apps' into next
    
    86453930 VS: Fix PackageCertificateKeyFile generation


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=86453930a6c8e3fe1416e8147c201fdebece8f4f
commit 86453930a6c8e3fe1416e8147c201fdebece8f4f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Aug 27 11:14:43 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Aug 27 11:24:39 2014 -0400

    VS: Fix PackageCertificateKeyFile generation
    
    Make it work when an app manifest is explicitly provided.

diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 6f1fe52..c00d400 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -2366,12 +2366,17 @@ void cmVisualStudio10TargetGenerator::WriteWinRTPackageCertificateKeyFile()
         this->AddedFiles.push_back(pfxFile);
         }
 
-      if(!pfxFile.empty())
-        {
-        this->WriteString("<", 2);
-        (*this->BuildFileStream) << "PackageCertificateKeyFile>"
-          << pfxFile << "</PackageCertificateKeyFile>\n";
-        }
+      this->WriteString("<", 2);
+      (*this->BuildFileStream) << "PackageCertificateKeyFile>"
+        << pfxFile << "</PackageCertificateKeyFile>\n";
+      this->WriteString("</PropertyGroup>\n", 1);
+      }
+    else if(!pfxFile.empty())
+      {
+      this->WriteString("<PropertyGroup>\n", 1);
+      this->WriteString("<", 2);
+      (*this->BuildFileStream) << "PackageCertificateKeyFile>"
+        << pfxFile << "</PackageCertificateKeyFile>\n";
       this->WriteString("</PropertyGroup>\n", 1);
       }
     }

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

Summary of changes:
 Source/cmVisualStudio10TargetGenerator.cxx |   17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake