[Cmake-commits] CMake branch, next, updated. v3.0.1-5225-g361f821

[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  361f821502aad75c7e3c686affdc9ecaa8127356 (commit)
       via  357fa93718aad94b622962056adf5a5486dcdeac (commit)
      from  8852e38dcb041b290ffbbb5954366b19dca45fa9 (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=361f821502aad75c7e3c686affdc9ecaa8127356
commit 361f821502aad75c7e3c686affdc9ecaa8127356
Merge: 8852e38 357fa93
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Sep 8 13:22:38 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Sep 8 13:22:38 2014 -0400

    Merge topic 'vs-generator-platform' into next
    
    357fa937 Tests: Fix RunCMake.include_external_msproject for generator platform


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=357fa93718aad94b622962056adf5a5486dcdeac
commit 357fa93718aad94b622962056adf5a5486dcdeac
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Sep 8 13:21:28 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Sep 8 13:21:28 2014 -0400

    Tests: Fix RunCMake.include_external_msproject for generator platform
    
    If an explicit generator platform is given then use it instead of
    looking for a platform from the generator name.

diff --git a/Tests/RunCMake/include_external_msproject/check_utils.cmake b/Tests/RunCMake/include_external_msproject/check_utils.cmake
index 7f5ef53..408cadb 100644
--- a/Tests/RunCMake/include_external_msproject/check_utils.cmake
+++ b/Tests/RunCMake/include_external_msproject/check_utils.cmake
@@ -80,7 +80,9 @@ function(check_project test name guid type platform)
     set(type 8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942)
   endif()
   if(NOT platform)
-    if("${RunCMake_GENERATOR}" MATCHES "Win64")
+    if(RunCMake_GENERATOR_PLATFORM)
+      set(platform "${RunCMake_GENERATOR_PLATFORM}")
+    elseif("${RunCMake_GENERATOR}" MATCHES "Win64")
       set(platform "x64")
     else()
       set(platform "Win32")

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

Summary of changes:
 Tests/RunCMake/include_external_msproject/check_utils.cmake |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake