[Cmake-commits] CMake branch, next, updated. v3.0.0-rc6-3353-gefcafba

[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  efcafba1d00668c6e7dc33b74ca7dc89f88901bf (commit)
       via  668e571d61c1d8e88b7893133e137a0a4eb62e35 (commit)
      from  65fa299f60cdd31f6d5d2053ca9888943bc2456c (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=efcafba1d00668c6e7dc33b74ca7dc89f88901bf
commit efcafba1d00668c6e7dc33b74ca7dc89f88901bf
Merge: 65fa299 668e571
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue May 27 09:24:11 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue May 27 09:24:11 2014 -0400

    Merge topic 'GNUtoMS-vs-12' into next
    
    668e571d GNUtoMS: Add support for VS 2013 (#14936)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=668e571d61c1d8e88b7893133e137a0a4eb62e35
commit 668e571d61c1d8e88b7893133e137a0a4eb62e35
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue May 27 09:05:57 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue May 27 09:24:26 2014 -0400

    GNUtoMS: Add support for VS 2013 (#14936)
    
    Add to the Platform/Windows-GNU module list of VS registry entries those
    for VS 2013.  Also add the name "vcvars64.bat" used by VS 10 and above
    for 64-bit tools.

diff --git a/Modules/Platform/Windows-GNU.cmake b/Modules/Platform/Windows-GNU.cmake
index 2bb7a20..872755c 100644
--- a/Modules/Platform/Windows-GNU.cmake
+++ b/Modules/Platform/Windows-GNU.cmake
@@ -151,6 +151,7 @@ macro(__windows_compiler_gnu_abi lang)
       find_program(CMAKE_GNUtoMS_VCVARS NAMES vcvars32.bat
         DOC "Visual Studio vcvars32.bat"
         PATHS
+        "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\12.0\\Setup\\VC;ProductDir]/bin"
         "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\11.0\\Setup\\VC;ProductDir]/bin"
         "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\10.0\\Setup\\VC;ProductDir]/bin"
         "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\9.0\\Setup\\VC;ProductDir]/bin"
@@ -160,9 +161,10 @@ macro(__windows_compiler_gnu_abi lang)
         )
       set(CMAKE_GNUtoMS_ARCH x86)
     elseif("${CMAKE_SIZEOF_VOID_P}" EQUAL 8)
-      find_program(CMAKE_GNUtoMS_VCVARS NAMES vcvarsamd64.bat
+      find_program(CMAKE_GNUtoMS_VCVARS NAMES vcvars64.bat vcvarsamd64.bat
         DOC "Visual Studio vcvarsamd64.bat"
         PATHS
+        "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\12.0\\Setup\\VC;ProductDir]/bin/amd64"
         "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\11.0\\Setup\\VC;ProductDir]/bin/amd64"
         "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\10.0\\Setup\\VC;ProductDir]/bin/amd64"
         "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\9.0\\Setup\\VC;ProductDir]/bin/amd64"

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

Summary of changes:
 Modules/Platform/Windows-GNU.cmake |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake