[Cmake-commits] CMake branch, next, updated. v3.2.1-1386-ge1f67dd

[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  e1f67dde426de4ab2c2e9013972bc51b81883cd0 (commit)
       via  c146d78ae0c80e97114d11a5e50eb4094101ee61 (commit)
      from  f35eabe9e13b51c50d06dfa32924cddbdd863f28 (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=e1f67dde426de4ab2c2e9013972bc51b81883cd0
commit e1f67dde426de4ab2c2e9013972bc51b81883cd0
Merge: f35eabe c146d78
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Apr 1 16:40:43 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Apr 1 16:40:43 2015 -0400

    Merge topic 'vs-xaml' into next
    
    c146d78a fixup! VS: Add support for XAML source files


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c146d78ae0c80e97114d11a5e50eb4094101ee61
commit c146d78ae0c80e97114d11a5e50eb4094101ee61
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Apr 1 16:40:04 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Apr 1 16:40:09 2015 -0400

    fixup! VS: Add support for XAML source files
    
    Do not use C++11 nullptr.

diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 80babca..ae6116f 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -559,13 +559,13 @@ void cmVisualStudio10TargetGenerator::WriteXamlFilesGroup()
       std::string obj = (*oi)->GetFullPath();
       std::string xamlType;
       const char * xamlTypeProperty = (*oi)->GetProperty("VS_XAML_TYPE");
-      if (xamlTypeProperty == nullptr)
+      if (xamlTypeProperty)
         {
-        xamlType = "Page";
+        xamlType = xamlTypeProperty;
         }
       else
         {
-        xamlType = xamlTypeProperty;
+        xamlType = "Page";
         }
 
       this->WriteSource(xamlType, *oi, ">\n");

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

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


hooks/post-receive
-- 
CMake