diff options
| author | Brad King <brad.king@kitware.com> | 2014-12-03 14:32:38 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-12-03 14:32:38 (GMT) |
| commit | 7c28e7c17205983ef16d72d4ad6f65649355e805 (patch) | |
| tree | ccd521d33c8e0c30980d4f730e3fc01448966c9d /Help/manual | |
| parent | 0e7c7bd3df17610795f8fc968370e883b87e50cf (diff) | |
| parent | 2a224b4ce3fcc3c25bb3f56cf50806ae79262fc2 (diff) | |
| download | CMake-7c28e7c17205983ef16d72d4ad6f65649355e805.zip CMake-7c28e7c17205983ef16d72d4ad6f65649355e805.tar.gz CMake-7c28e7c17205983ef16d72d4ad6f65649355e805.tar.bz2 | |
Merge branch 'vs-hlsl-settings' into release
Diffstat (limited to 'Help/manual')
| -rw-r--r-- | Help/manual/cmake-properties.7.rst | 2 |
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 |