summaryrefslogtreecommitdiffstats
path: root/Help
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-04-03 17:59:03 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2015-04-03 17:59:03 (GMT)
commit9ed24fbb5e37c7c4338d2117d66f7262fbc5e074 (patch)
tree0b6c1c22e9ccd473c26c149da66642534c0a24e5 /Help
parentb6b77bb750f30c452053ad4c28e4c69b1e7950e0 (diff)
parent01a9ab0def07ecddbc1bdfa67fec1bd3e6d030ea (diff)
downloadCMake-9ed24fbb5e37c7c4338d2117d66f7262fbc5e074.zip
CMake-9ed24fbb5e37c7c4338d2117d66f7262fbc5e074.tar.gz
CMake-9ed24fbb5e37c7c4338d2117d66f7262fbc5e074.tar.bz2
Merge topic 'vs-xaml'
01a9ab0d VS: Add support for XAML source files
Diffstat (limited to 'Help')
-rw-r--r--Help/manual/cmake-properties.7.rst1
-rw-r--r--Help/prop_sf/VS_XAML_TYPE.rst6
-rw-r--r--Help/release/dev/vs-xaml.rst6
3 files changed, 13 insertions, 0 deletions
diff --git a/Help/manual/cmake-properties.7.rst b/Help/manual/cmake-properties.7.rst
index 1dff33e..76dd279 100644
--- a/Help/manual/cmake-properties.7.rst
+++ b/Help/manual/cmake-properties.7.rst
@@ -298,6 +298,7 @@ Properties on Source Files
/prop_sf/VS_SHADER_FLAGS
/prop_sf/VS_SHADER_MODEL
/prop_sf/VS_SHADER_TYPE
+ /prop_sf/VS_XAML_TYPE
/prop_sf/WRAP_EXCLUDE
/prop_sf/XCODE_EXPLICIT_FILE_TYPE
/prop_sf/XCODE_LAST_KNOWN_FILE_TYPE
diff --git a/Help/prop_sf/VS_XAML_TYPE.rst b/Help/prop_sf/VS_XAML_TYPE.rst
new file mode 100644
index 0000000..e92191d
--- /dev/null
+++ b/Help/prop_sf/VS_XAML_TYPE.rst
@@ -0,0 +1,6 @@
+VS_XAML_TYPE
+------------
+
+Mark a XAML source file as a different type than the default ``Page``.
+The most common usage would be to set the default App.xaml file as
+ApplicationDefinition.
diff --git a/Help/release/dev/vs-xaml.rst b/Help/release/dev/vs-xaml.rst
new file mode 100644
index 0000000..575899f
--- /dev/null
+++ b/Help/release/dev/vs-xaml.rst
@@ -0,0 +1,6 @@
+vs-xaml
+-------
+
+* The :ref:`Visual Studio Generators` learned to support ``.xaml``
+ source files and automatically associate them with corresponding
+ ``.h`` and ``.cpp`` sources.