[Cmake-commits] CMake branch, next, updated. v3.1.1-2412-g9bae20c

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  9bae20cd9565fa3f5b2197d20316d79239f14848 (commit)
       via  a30dc4776c1c853e26cbb4a819b2471f7b1242e0 (commit)
      from  37a16068b3fae9304bcc471b6361297ee4c1c534 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9bae20cd9565fa3f5b2197d20316d79239f14848
commit 9bae20cd9565fa3f5b2197d20316d79239f14848
Merge: 37a1606 a30dc47
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 28 09:29:45 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 28 09:29:45 2015 -0500

    Merge topic 'vs-shader-flags' into next
    
    a30dc477 fixup! VS: Add source file property to set extra hlsl shader flags


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a30dc4776c1c853e26cbb4a819b2471f7b1242e0
commit a30dc4776c1c853e26cbb4a819b2471f7b1242e0
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 28 06:28:44 2015 -0800
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Jan 28 09:29:25 2015 -0500

    fixup! VS: Add source file property to set extra hlsl shader flags

diff --git a/Tests/VSWinStorePhone/CMakeLists.txt b/Tests/VSWinStorePhone/CMakeLists.txt
index 719a594..8357d5f 100644
--- a/Tests/VSWinStorePhone/CMakeLists.txt
+++ b/Tests/VSWinStorePhone/CMakeLists.txt
@@ -110,12 +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 "/Fh $(OutDir)%(Filename).h")
+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 "/Fh $(OutDir)%(Filename).h")
+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;

-----------------------------------------------------------------------

Summary of changes:
 Tests/VSWinStorePhone/CMakeLists.txt                       |    4 ++--
 Tests/VSWinStorePhone/Direct3DApp1/SimplePixelShader.hlsl  |    4 ++++
 Tests/VSWinStorePhone/Direct3DApp1/SimpleVertexShader.hlsl |    4 ++++
 3 files changed, 10 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake