diff options
| author | Brad King <brad.king@kitware.com> | 2017-09-29 12:56:01 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-09-29 12:56:04 (GMT) |
| commit | 59285ee58ea2a02b53ca1e429ded198ee2c2fd21 (patch) | |
| tree | 2d4d4582a2a5f68a1885c77dc7dd83052ffdffc5 /Tests | |
| parent | 9fc0453140b6d35af1dd627d4a2e0ea95a2feaff (diff) | |
| parent | 49dab3ebfb377e1f2cd826c731c26ddc5346f520 (diff) | |
| download | CMake-59285ee58ea2a02b53ca1e429ded198ee2c2fd21.zip CMake-59285ee58ea2a02b53ca1e429ded198ee2c2fd21.tar.gz CMake-59285ee58ea2a02b53ca1e429ded198ee2c2fd21.tar.bz2 | |
Merge topic 'add-vs-shader-properties'
49dab3eb VS: Add VS_SHADER_OUTPUT_HEADER_FILE and VS_SHADER_VARIABLE_NAME properties.
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1319
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/VSWinStorePhone/CMakeLists.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Tests/VSWinStorePhone/CMakeLists.txt b/Tests/VSWinStorePhone/CMakeLists.txt index 2b0c478..acda117 100644 --- a/Tests/VSWinStorePhone/CMakeLists.txt +++ b/Tests/VSWinStorePhone/CMakeLists.txt @@ -116,12 +116,14 @@ set_property(SOURCE ${RELEASE_CONTENT_FILES} PROPERTY set_property(SOURCE ${PIXELSHADER_FILES} PROPERTY VS_SHADER_TYPE Pixel) set_property(SOURCE ${PIXELSHADER_FILES} PROPERTY VS_SHADER_ENTRYPOINT mainPS) set_property(SOURCE ${PIXELSHADER_FILES} PROPERTY VS_SHADER_MODEL 4.0_level_9_3) -set_property(SOURCE ${PIXELSHADER_FILES} PROPERTY VS_SHADER_FLAGS "/DFLAGS_ADDED /Fh \"$(OutDir)%(Filename).h\"") +set_property(SOURCE ${PIXELSHADER_FILES} PROPERTY VS_SHADER_FLAGS "/DFLAGS_ADDED") +set_property(SOURCE ${PIXELSHADER_FILES} PROPERTY VS_SHADER_OUTPUT_HEADER_FILE "$(OutDir)%(Filename).h") set_property(SOURCE ${VERTEXSHADER_FILES} PROPERTY VS_SHADER_TYPE Vertex) set_property(SOURCE ${VERTEXSHADER_FILES} PROPERTY VS_SHADER_ENTRYPOINT mainVS) set_property(SOURCE ${VERTEXSHADER_FILES} PROPERTY VS_SHADER_MODEL 4.0_level_9_3) -set_property(SOURCE ${VERTEXSHADER_FILES} PROPERTY VS_SHADER_FLAGS "/DFLAGS_ADDED /Fh \"$(OutDir)%(Filename).h\"") +set_property(SOURCE ${VERTEXSHADER_FILES} PROPERTY VS_SHADER_FLAGS "/DFLAGS_ADDED") +set_property(SOURCE ${VERTEXSHADER_FILES} PROPERTY VS_SHADER_OUTPUT_HEADER_FILE "$(OutDir)%(Filename).h") source_group("Source Files" FILES ${SOURCE_FILES}) |