diff options
| author | Brad King <brad.king@kitware.com> | 2014-08-18 17:31:41 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-08-18 17:31:41 (GMT) |
| commit | f7ab23837994a4a6eff1c5ebf183ae915380b41c (patch) | |
| tree | 05388293a9f5181e09563fdf43628300126f1ee5 /Help/manual/cmake-properties.7.rst | |
| parent | cb578878093473ef1cb3d2e71791d67a410d4184 (diff) | |
| parent | aa21001bd3c723f79e74407a2ba315d5988804a0 (diff) | |
| download | CMake-f7ab23837994a4a6eff1c5ebf183ae915380b41c.zip CMake-f7ab23837994a4a6eff1c5ebf183ae915380b41c.tar.gz CMake-f7ab23837994a4a6eff1c5ebf183ae915380b41c.tar.bz2 | |
Merge topic 'vs-special-source-file-properties'
aa21001b Help: Add notes for topic 'vs-special-source-file-properties'
6fe770e1 VS: Add a source file property to set the hlsl shader type
9b4dc2ad VS: Add a source file property to mark content for Windows App deployment
f063a914 VS: Re-arrange WriteExtraSource to support tool configuration
Diffstat (limited to 'Help/manual/cmake-properties.7.rst')
| -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 9faf99a..5b0673a 100644 --- a/Help/manual/cmake-properties.7.rst +++ b/Help/manual/cmake-properties.7.rst @@ -287,6 +287,8 @@ Properties on Source Files /prop_sf/OBJECT_DEPENDS /prop_sf/OBJECT_OUTPUTS /prop_sf/SYMBOLIC + /prop_sf/VS_DEPLOYMENT_CONTENT + /prop_sf/VS_SHADER_TYPE /prop_sf/WRAP_EXCLUDE /prop_sf/XCODE_EXPLICIT_FILE_TYPE /prop_sf/XCODE_LAST_KNOWN_FILE_TYPE |