[Cmake-commits] CMake branch, next, updated. v3.3.0-1566-ge55a1b5

[Chuck Atkins]

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  e55a1b5e7d74cc5f7ead80b2b22ee768c2918520 (commit)
       via  d915e804eeb73f8fb926d2313015ce4aada906ec (commit)
      from  7c8e1606394017c70f6f425e0aa09194628160a3 (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=e55a1b5e7d74cc5f7ead80b2b22ee768c2918520
commit e55a1b5e7d74cc5f7ead80b2b22ee768c2918520
Merge: 7c8e160 d915e80
Author:     Chuck Atkins <chuck.atkins at kitware.com>
AuthorDate: Thu Jul 30 11:48:48 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jul 30 11:48:48 2015 -0400

    Merge topic 'fix-cray-version' into next
    
    d915e804 BUG15664: Fix compiler version detection for craycc and crayCC.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d915e804eeb73f8fb926d2313015ce4aada906ec
commit d915e804eeb73f8fb926d2313015ce4aada906ec
Author:     Chuck Atkins <chuck.atkins at kitware.com>
AuthorDate: Thu Jul 30 11:09:55 2015 -0400
Commit:     Chuck Atkins <chuck.atkins at kitware.com>
CommitDate: Thu Jul 30 11:09:55 2015 -0400

    BUG15664: Fix compiler version detection for craycc and crayCC.

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:
 Modules/Compiler/Cray-DetermineCompiler.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake