summaryrefslogtreecommitdiffstats
path: root/Help/manual
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2014-12-03 15:01:49 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2014-12-03 15:01:49 (GMT)
commitb9eac05fb65198f1522ecec756f3fb4ae253e34b (patch)
treed0e8e89dfec28f139994e87aa564260920d394e8 /Help/manual
parentf773e28a8e6033ca128e1dd223fc2345a97efba5 (diff)
parent2a224b4ce3fcc3c25bb3f56cf50806ae79262fc2 (diff)
downloadCMake-b9eac05fb65198f1522ecec756f3fb4ae253e34b.zip
CMake-b9eac05fb65198f1522ecec756f3fb4ae253e34b.tar.gz
CMake-b9eac05fb65198f1522ecec756f3fb4ae253e34b.tar.bz2
Merge topic 'vs-hlsl-settings'
2a224b4c VS: Add source file properties to set the hlsl shader entry point and model
Diffstat (limited to 'Help/manual')
-rw-r--r--Help/manual/cmake-properties.7.rst2
1 files changed, 2 insertions, 0 deletions
diff --git a/Help/manual/cmake-properties.7.rst b/Help/manual/cmake-properties.7.rst
index bf456f5..9ed53fa 100644
--- a/Help/manual/cmake-properties.7.rst
+++ b/Help/manual/cmake-properties.7.rst
@@ -291,6 +291,8 @@ Properties on Source Files
/prop_sf/OBJECT_OUTPUTS
/prop_sf/SYMBOLIC
/prop_sf/VS_DEPLOYMENT_CONTENT
+ /prop_sf/VS_SHADER_ENTRYPOINT
+ /prop_sf/VS_SHADER_MODEL
/prop_sf/VS_SHADER_TYPE
/prop_sf/WRAP_EXCLUDE
/prop_sf/XCODE_EXPLICIT_FILE_TYPE