diff options
| author | Brad King <brad.king@kitware.com> | 2015-01-29 14:13:58 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-01-29 14:13:58 (GMT) |
| commit | 98659aecfd819eb1e7771f7420933316a628b057 (patch) | |
| tree | 5c5fe154a326b9e8755b1dbf145a82ec7ca25f74 /Tests | |
| parent | 983a98e5b8118ff5063400d8ffac7a511ca8002a (diff) | |
| parent | 4775c90145da7ec8a5a87ce5b8b88dc4fc8c1925 (diff) | |
| download | CMake-98659aecfd819eb1e7771f7420933316a628b057.zip CMake-98659aecfd819eb1e7771f7420933316a628b057.tar.gz CMake-98659aecfd819eb1e7771f7420933316a628b057.tar.bz2 | |
Merge topic 'vs-shader-flags'
4775c901 VS: Add source file property to set extra hlsl shader flags
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/VSWinStorePhone/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Tests/VSWinStorePhone/Direct3DApp1/SimplePixelShader.hlsl | 4 | ||||
| -rw-r--r-- | Tests/VSWinStorePhone/Direct3DApp1/SimpleVertexShader.hlsl | 4 |
3 files changed, 10 insertions, 0 deletions
diff --git a/Tests/VSWinStorePhone/CMakeLists.txt b/Tests/VSWinStorePhone/CMakeLists.txt index 7227fcc..8357d5f 100644 --- a/Tests/VSWinStorePhone/CMakeLists.txt +++ b/Tests/VSWinStorePhone/CMakeLists.txt @@ -110,10 +110,12 @@ 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 ${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\"") source_group("Source Files" FILES ${SOURCE_FILES}) diff --git a/Tests/VSWinStorePhone/Direct3DApp1/SimplePixelShader.hlsl b/Tests/VSWinStorePhone/Direct3DApp1/SimplePixelShader.hlsl index 6796da1..b2fe7be 100644 --- a/Tests/VSWinStorePhone/Direct3DApp1/SimplePixelShader.hlsl +++ b/Tests/VSWinStorePhone/Direct3DApp1/SimplePixelShader.hlsl @@ -1,3 +1,7 @@ +#if !defined(FLAGS_ADDED) +# error FLAGS_ADDED not defined +#endif + struct PixelShaderInput { float4 pos : SV_POSITION; diff --git a/Tests/VSWinStorePhone/Direct3DApp1/SimpleVertexShader.hlsl b/Tests/VSWinStorePhone/Direct3DApp1/SimpleVertexShader.hlsl index 0963060..3f9a4eb 100644 --- a/Tests/VSWinStorePhone/Direct3DApp1/SimpleVertexShader.hlsl +++ b/Tests/VSWinStorePhone/Direct3DApp1/SimpleVertexShader.hlsl @@ -1,3 +1,7 @@ +#if !defined(FLAGS_ADDED) +# error FLAGS_ADDED not defined +#endif + cbuffer ModelViewProjectionConstantBuffer : register(b0) { matrix model; |