[Cmake-commits] CMake branch, next, updated. v3.6.0-872-gd0a5f23

[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  d0a5f2376f221009da1de5b38f997fb04f1a2e0f (commit)
       via  a6290cffaec49fc06875d6f0379af7d712b90bb3 (commit)
      from  dd96dd9740d83a1de6e7071862f09f0e8c0e38c6 (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=d0a5f2376f221009da1de5b38f997fb04f1a2e0f
commit d0a5f2376f221009da1de5b38f997fb04f1a2e0f
Merge: dd96dd9 a6290cf
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jul 15 10:39:22 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jul 15 10:39:22 2016 -0400

    Merge topic 'vs-natvis' into next
    
    a6290cff VS: Add support for NATVIS files


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a6290cffaec49fc06875d6f0379af7d712b90bb3
commit a6290cffaec49fc06875d6f0379af7d712b90bb3
Author:     Robert Dailey <robert at ziosk.com>
AuthorDate: Fri Jul 15 09:19:03 2016 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Jul 15 10:36:21 2016 -0400

    VS: Add support for NATVIS files
    
    Add an explicit `<Natvis>` element in VS project files for `*.natvis`
    files.  These enable custom debug visualizers for project-specific
    types.
    
    Fixes #16043.

diff --git a/Help/release/dev/vs-natvis.rst b/Help/release/dev/vs-natvis.rst
new file mode 100644
index 0000000..7cc9844
--- /dev/null
+++ b/Help/release/dev/vs-natvis.rst
@@ -0,0 +1,5 @@
+vs-natvis
+---------
+
+* :ref:`Visual Studio Generators` for VS 2010 and above learned to
+  place ``.natvis`` source files into VS project files properly.
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index f5bbf4d..29459db 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -1187,6 +1187,8 @@ void cmVisualStudio10TargetGenerator::WriteExtraSource(cmSourceFile const* sf)
     tool = "PRIResource";
   } else if (ext == "xml") {
     tool = "XML";
+  } else if (ext == "natvis") {
+    tool = "Natvis";
   }
 
   if (this->NsightTegra) {

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

Summary of changes:
 Help/release/dev/vs-natvis.rst             |    5 +++++
 Source/cmVisualStudio10TargetGenerator.cxx |    2 ++
 2 files changed, 7 insertions(+)
 create mode 100644 Help/release/dev/vs-natvis.rst


hooks/post-receive
-- 
CMake