summaryrefslogtreecommitdiffstats
path: root/Help/manual
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2017-03-02 13:38:16 (GMT)
committerBrad King <brad.king@kitware.com>2017-03-02 13:38:16 (GMT)
commitfce6233d8be9ed70989875460ee7628f55788554 (patch)
treea52f9aa287bf596928d1f8c278bc6ca09bb76deb /Help/manual
parentbaed38107eff0da23fc91b18d926fab9a4750f8c (diff)
parent506207f928bfc8853864edb9a200a38e7ac2b02b (diff)
downloadCMake-fce6233d8be9ed70989875460ee7628f55788554.zip
CMake-fce6233d8be9ed70989875460ee7628f55788554.tar.gz
CMake-fce6233d8be9ed70989875460ee7628f55788554.tar.bz2
Merge branch 'csproj_add_free_source_tags' into release
Diffstat (limited to 'Help/manual')
-rw-r--r--Help/manual/cmake-modules.7.rst1
-rw-r--r--Help/manual/cmake-properties.7.rst1
2 files changed, 2 insertions, 0 deletions
diff --git a/Help/manual/cmake-modules.7.rst b/Help/manual/cmake-modules.7.rst
index d4712ba..c478a1b 100644
--- a/Help/manual/cmake-modules.7.rst
+++ b/Help/manual/cmake-modules.7.rst
@@ -66,6 +66,7 @@ All Modules
/module/CPackRPM
/module/CPack
/module/CPackWIX
+ /module/CSharpUtilities
/module/CTest
/module/CTestCoverageCollectGCOV
/module/CTestScriptMode
diff --git a/Help/manual/cmake-properties.7.rst b/Help/manual/cmake-properties.7.rst
index 38aba81..0e3eb86 100644
--- a/Help/manual/cmake-properties.7.rst
+++ b/Help/manual/cmake-properties.7.rst
@@ -366,6 +366,7 @@ Properties on Source Files
/prop_sf/SKIP_AUTOUIC
/prop_sf/SYMBOLIC
/prop_sf/VS_COPY_TO_OUT_DIR
+ /prop_sf/VS_CSHARP_tagname
/prop_sf/VS_DEPLOYMENT_CONTENT
/prop_sf/VS_DEPLOYMENT_LOCATION
/prop_sf/VS_INCLUDE_IN_VSIX