diff options
| author | Brad King <brad.king@kitware.com> | 2018-04-25 12:53:49 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-04-25 12:53:54 (GMT) |
| commit | e5d15848ca6cdc52ff44edcde7689518793a5eb6 (patch) | |
| tree | b0c69d6e7f99bc338dcef8447af65905df21ac66 /Help | |
| parent | 8fd76452a46b89450a1d3a5d5eb5c96541dc20a1 (diff) | |
| parent | 8d1ccbc693398b3ac67aa6f0cf222c6ed78fc9b8 (diff) | |
| download | CMake-e5d15848ca6cdc52ff44edcde7689518793a5eb6.zip CMake-e5d15848ca6cdc52ff44edcde7689518793a5eb6.tar.gz CMake-e5d15848ca6cdc52ff44edcde7689518793a5eb6.tar.bz2 | |
Merge topic 'vs-hlsl-object-name'
8d1ccbc693 VS: Add VS_SHADER_OBJECT_FILE_NAME source file property
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1997
Diffstat (limited to 'Help')
| -rw-r--r-- | Help/manual/cmake-properties.7.rst | 1 | ||||
| -rw-r--r-- | Help/prop_sf/VS_SHADER_OBJECT_FILE_NAME.rst | 6 | ||||
| -rw-r--r-- | Help/release/dev/vs-hlsl-object-name.rst | 6 |
3 files changed, 13 insertions, 0 deletions
diff --git a/Help/manual/cmake-properties.7.rst b/Help/manual/cmake-properties.7.rst index d141479..b3e2fec 100644 --- a/Help/manual/cmake-properties.7.rst +++ b/Help/manual/cmake-properties.7.rst @@ -405,6 +405,7 @@ Properties on Source Files /prop_sf/VS_SHADER_ENTRYPOINT /prop_sf/VS_SHADER_FLAGS /prop_sf/VS_SHADER_MODEL + /prop_sf/VS_SHADER_OBJECT_FILE_NAME /prop_sf/VS_SHADER_OUTPUT_HEADER_FILE /prop_sf/VS_SHADER_TYPE /prop_sf/VS_SHADER_VARIABLE_NAME diff --git a/Help/prop_sf/VS_SHADER_OBJECT_FILE_NAME.rst b/Help/prop_sf/VS_SHADER_OBJECT_FILE_NAME.rst new file mode 100644 index 0000000..093bcc6 --- /dev/null +++ b/Help/prop_sf/VS_SHADER_OBJECT_FILE_NAME.rst @@ -0,0 +1,6 @@ +VS_SHADER_OBJECT_FILE_NAME +-------------------------- + +Specifies a file name for the compiled shader object file for an ``.hlsl`` +source file. This adds the ``-Fo`` flag to the command line for the FxCompiler +tool. diff --git a/Help/release/dev/vs-hlsl-object-name.rst b/Help/release/dev/vs-hlsl-object-name.rst new file mode 100644 index 0000000..625e5ee --- /dev/null +++ b/Help/release/dev/vs-hlsl-object-name.rst @@ -0,0 +1,6 @@ +vs-hlsl-object-name +------------------- + +* HLSL source file property :prop_sf:`VS_SHADER_OBJECT_FILE_NAME` has been + added to the :ref:`Visual Studio Generators` for VS 2010 and above. + The property specifies the file name of the compiled shader object. |