[Cmake-commits] CMake branch, next, updated. v3.3.0-1568-ge05d78a

[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  e05d78a040d22d1d918c8704824e800ac9c0cfe1 (commit)
       via  22809b1665dd2b561fda280d486d099bad6ac877 (commit)
      from  e55a1b5e7d74cc5f7ead80b2b22ee768c2918520 (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=e05d78a040d22d1d918c8704824e800ac9c0cfe1
commit e05d78a040d22d1d918c8704824e800ac9c0cfe1
Merge: e55a1b5 22809b1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jul 30 11:57:51 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jul 30 11:57:51 2015 -0400

    Merge topic 'fix-cray-version' into next
    
    22809b16 Cray: Fix compiler version detection (#15664)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=22809b1665dd2b561fda280d486d099bad6ac877
commit 22809b1665dd2b561fda280d486d099bad6ac877
Author:     Justin Cook <jcook at cray.com>
AuthorDate: Thu Jul 30 11:57:10 2015 -0400
Commit:     Chuck Atkins <chuck.atkins at kitware.com>
CommitDate: Thu Jul 30 11:57:10 2015 -0400

    Cray: Fix compiler version detection (#15664)

diff --git a/Modules/Compiler/Cray-DetermineCompiler.cmake b/Modules/Compiler/Cray-DetermineCompiler.cmake
index 881b82c..6602294 100644
--- a/Modules/Compiler/Cray-DetermineCompiler.cmake
+++ b/Modules/Compiler/Cray-DetermineCompiler.cmake
@@ -2,5 +2,5 @@
 set(_compiler_id_pp_test "defined(_CRAYC)")
 
 set(_compiler_id_version_compute "
-# define @PREFIX at COMPILER_VERSION_MAJOR @MACRO_DEC@(_RELEASE)
+# define @PREFIX at COMPILER_VERSION_MAJOR @MACRO_DEC@(_RELEASE_MAJOR)
 # define @PREFIX at COMPILER_VERSION_MINOR @MACRO_DEC@(_RELEASE_MINOR)")

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

Summary of changes:


hooks/post-receive
-- 
CMake