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 | |
| 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')
| -rw-r--r-- | Help/manual/cmake-properties.7.rst | 1 | ||||
| -rw-r--r-- | Help/prop_sf/VS_DEPLOYMENT_LOCATION.rst | 8 | ||||
| -rw-r--r-- | Help/release/3.1.0.rst | 4 |
3 files changed, 13 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 diff --git a/Help/prop_sf/VS_DEPLOYMENT_LOCATION.rst b/Help/prop_sf/VS_DEPLOYMENT_LOCATION.rst new file mode 100644 index 0000000..303db95 --- /dev/null +++ b/Help/prop_sf/VS_DEPLOYMENT_LOCATION.rst @@ -0,0 +1,8 @@ +VS_DEPLOYMENT_LOCATION +---------------------- + +Specifies the deployment location for a content source file with a Windows +Phone or Windows Store application when built with a Visual Studio generator. +This property is only applicable when using :prop_sf:`VS_DEPLOYMENT_CONTENT`. +The value represent the path relative to the app package and applies to all +configurations. diff --git a/Help/release/3.1.0.rst b/Help/release/3.1.0.rst index 1ffc5b5..96717c6 100644 --- a/Help/release/3.1.0.rst +++ b/Help/release/3.1.0.rst @@ -165,6 +165,10 @@ Properties to tell the Visual Studio generators to mark content for deployment in Windows Phone and Windows Store projects. +* A :prop_sf:`VS_DEPLOYMENT_LOCATION` source file property was added + to tell the Visual Studio generators the relative location of content + marked for deployment in Windows Phone and Windows Store projects. + * The :prop_tgt:`VS_WINRT_COMPONENT` target property was created to tell Visual Studio generators to compile a shared library as a Windows Runtime (WinRT) component. |