diff options
author | Brad King <brad.king@kitware.com> | 2020-03-30 17:27:23 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2020-03-30 17:28:19 (GMT) |
commit | ad22d0c1d01266db5d5210d36c1d71d85ca77eb4 (patch) | |
tree | 16f6e51b9c5c5a6889e9d8709ed05e0b21f3a0e1 /Help/manual | |
parent | cfa3a2342f01ada6278bccf4c151b0e1e88798c4 (diff) | |
parent | 0723e04f7a13ca1b1ae5c4ef2c603b922bcf82e8 (diff) | |
download | CMake-ad22d0c1d01266db5d5210d36c1d71d85ca77eb4.zip CMake-ad22d0c1d01266db5d5210d36c1d71d85ca77eb4.tar.gz CMake-ad22d0c1d01266db5d5210d36c1d71d85ca77eb4.tar.bz2 |
Merge topic 'vs-non-built-file-item-metadata'
0723e04f7a VS: Add documentation for VS_SETTINGS and VS_SOURCE_SETTINGS_<tool>.
2ca1102f83 VS: Test VS_SETTINGS and VS_SOURCE_SETTINGS_<tool> properties.
f00e1b816d VS: Add VS_SOURCE_SETTINGS_<tool> target property
2ce42f281f VS: Add VS_SETTINGS source file property
53116d3942 VS: Use unordered_map to write HLSL settings.
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4498
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 a2bbdcd..cbb2298 100644 --- a/Help/manual/cmake-properties.7.rst +++ b/Help/manual/cmake-properties.7.rst @@ -378,6 +378,7 @@ Properties on Targets /prop_tgt/VS_SCC_PROVIDER /prop_tgt/VS_SDK_REFERENCES /prop_tgt/VS_SOLUTION_DEPLOY + /prop_tgt/VS_SOURCE_SETTINGS_tool /prop_tgt/VS_USER_PROPS /prop_tgt/VS_WINDOWS_TARGET_PLATFORM_MIN_VERSION /prop_tgt/VS_WINRT_COMPONENT @@ -487,6 +488,7 @@ Properties on Source Files /prop_sf/VS_DEPLOYMENT_LOCATION /prop_sf/VS_INCLUDE_IN_VSIX /prop_sf/VS_RESOURCE_GENERATOR + /prop_sf/VS_SETTINGS /prop_sf/VS_SHADER_DISABLE_OPTIMIZATIONS /prop_sf/VS_SHADER_ENABLE_DEBUG /prop_sf/VS_SHADER_ENTRYPOINT |