From a6290cffaec49fc06875d6f0379af7d712b90bb3 Mon Sep 17 00:00:00 2001
From: Robert Dailey <robert@ziosk.com>
Date: Fri, 15 Jul 2016 09:19:03 -0500
Subject: [PATCH] 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.
---
 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

diff --git a/Help/release/dev/vs-natvis.rst b/Help/release/dev/vs-natvis.rst
new file mode 100644
index 000000000..7cc9844cb
--- /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 f5bbf4d78..29459dbdf 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) {