summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2016-07-18 12:57:33 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2016-07-18 12:57:33 (GMT)
commit8a5472bd2fc043b3b0f68b080a86e0ed330d4638 (patch)
tree93ce50e54bcb8656c9e92505185ac2dd3523b037
parentd0be6582057c71f1aaf4d313d4446ae29f56add3 (diff)
parenta6290cffaec49fc06875d6f0379af7d712b90bb3 (diff)
downloadCMake-8a5472bd2fc043b3b0f68b080a86e0ed330d4638.zip
CMake-8a5472bd2fc043b3b0f68b080a86e0ed330d4638.tar.gz
CMake-8a5472bd2fc043b3b0f68b080a86e0ed330d4638.tar.bz2
Merge topic 'vs-natvis'
a6290cff VS: Add support for NATVIS files
-rw-r--r--Help/release/dev/vs-natvis.rst5
-rw-r--r--Source/cmVisualStudio10TargetGenerator.cxx2
2 files changed, 7 insertions, 0 deletions
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) {