diff options
author | Brad King <brad.king@kitware.com> | 2014-12-03 14:32:42 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2014-12-03 14:32:42 (GMT) |
commit | 1c104c019a23392563befb3564dd5c679cc2c585 (patch) | |
tree | 891880c5fa7b86c0246d2b7704a9180b0ef12adc /Help/manual | |
parent | 7c28e7c17205983ef16d72d4ad6f65649355e805 (diff) | |
parent | 352f246f3ebfd8daf5fda9bad2db01b56fa4bf4d (diff) | |
download | CMake-1c104c019a23392563befb3564dd5c679cc2c585.zip CMake-1c104c019a23392563befb3564dd5c679cc2c585.tar.gz CMake-1c104c019a23392563befb3564dd5c679cc2c585.tar.bz2 |
Merge branch 'vs-phone-store-deployment-location' into release
Diffstat (limited to 'Help/manual')
-rw-r--r-- | Help/manual/cmake-properties.7.rst | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Help/manual/cmake-properties.7.rst b/Help/manual/cmake-properties.7.rst index 9ed53fa..cca6d28 100644 --- a/Help/manual/cmake-properties.7.rst +++ b/Help/manual/cmake-properties.7.rst @@ -291,6 +291,7 @@ Properties on Source Files /prop_sf/OBJECT_OUTPUTS /prop_sf/SYMBOLIC /prop_sf/VS_DEPLOYMENT_CONTENT + /prop_sf/VS_DEPLOYMENT_LOCATION /prop_sf/VS_SHADER_ENTRYPOINT /prop_sf/VS_SHADER_MODEL /prop_sf/VS_SHADER_TYPE |