[Cmake-commits] CMake branch, next, updated. v3.4.0-rc2-1170-g883f9c4

[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  883f9c45c53320c48939d956c4bcd4c47b850716 (commit)
       via  77dde5cb1f760d180e145b102997a72baac16c33 (commit)
      from  1df2cc256c7a60d3075390a5dd7704332ab1444b (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=883f9c45c53320c48939d956c4bcd4c47b850716
commit 883f9c45c53320c48939d956c4bcd4c47b850716
Merge: 1df2cc2 77dde5c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 28 15:19:41 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 28 15:19:41 2015 -0400

    Merge topic 'vs-resw-files' into next
    
    77dde5cb VS: Add support for `.resw` files (#15811)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=77dde5cb1f760d180e145b102997a72baac16c33
commit 77dde5cb1f760d180e145b102997a72baac16c33
Author:     Andrew Shaitorov <rain at fenomen-games.com>
AuthorDate: Thu Oct 22 20:17:27 2015 +0300
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Oct 28 15:19:21 2015 -0400

    VS: Add support for `.resw` files (#15811)
    
    These are used on the WinRT & WinPhone platforms.  Build them using the
    `PRIResource` tool.

diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 2395ce7..1de2847 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -1305,6 +1305,10 @@ void cmVisualStudio10TargetGenerator::WriteExtraSource(cmSourceFile const* sf)
     {
     tool = "Image";
     }
+  else if(ext == "resw")
+    {
+    tool = "PRIResource";
+    }
   else if(ext == "xml")
     {
     tool = "XML";

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

Summary of changes:
 Source/cmVisualStudio10TargetGenerator.cxx |    4 ++++
 1 file changed, 4 insertions(+)


hooks/post-receive
-- 
CMake