[Cmake-commits] CMake branch, next, updated. v3.0.2-5389-g04aed0b

[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  04aed0b7c46aa0c884e714c60ef25261d072d384 (commit)
       via  d4ca8fb2bd8c6e6a84bce2b7f91142f325e3d489 (commit)
      from  997fd8865c8563f5d384b141e75f26bcea38e58b (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=04aed0b7c46aa0c884e714c60ef25261d072d384
commit 04aed0b7c46aa0c884e714c60ef25261d072d384
Merge: 997fd88 d4ca8fb
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Sep 19 13:49:49 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Sep 19 13:49:49 2014 -0400

    Merge topic 'vs-windows-store-certifictes' into next
    
    d4ca8fb2 VS: Add Certificates to .vcxproj files


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d4ca8fb2bd8c6e6a84bce2b7f91142f325e3d489
commit d4ca8fb2bd8c6e6a84bce2b7f91142f325e3d489
Author:     Gilles Khouzam <gillesk at microsoft.com>
AuthorDate: Thu Sep 18 14:14:54 2014 -0700
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Sep 19 13:46:00 2014 -0400

    VS: Add Certificates to .vcxproj files
    
    After certificates were moved into their own category in
    cmGeneratorTarget, that category was not added for output by the VS 10
    generator.  Add it now.

diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 4b5c83f..fc8fccd 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -1330,6 +1330,10 @@ void cmVisualStudio10TargetGenerator::WriteAllSources()
   this->GeneratorTarget->GetAppManifest(manifestSources, "");
   this->WriteSources("AppxManifest", manifestSources);
 
+  std::vector<cmSourceFile const*> certificateSources;
+  this->GeneratorTarget->GetCertificates(certificateSources, "");
+  this->WriteSources("None", certificateSources);
+
   std::vector<cmSourceFile const*> externalObjects;
   this->GeneratorTarget->GetExternalObjects(externalObjects, "");
   for(std::vector<cmSourceFile const*>::iterator

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

Summary of changes:
 Source/cmVisualStudio10TargetGenerator.cxx |    4 ++++
 1 file changed, 4 insertions(+)


hooks/post-receive
-- 
CMake