[Cmake-commits] CMake branch, next, updated. v2.8.5-1626-g5fa6386

[Stephen Kelly]

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  5fa6386a4753aa8ae0e65798bfeb98d5328f00ef (commit)
       via  bf73e759413d33f7d2950ecb46530cffebfbd333 (commit)
       via  aa4f0b6ba813c69e73d66c51ece183e8e97f622b (commit)
       via  a493d1a35305d26e9c360f82b969adde1dfd64ae (commit)
      from  6e08230ad11f360cb6e1589b46e0a29d37a0488d (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=5fa6386a4753aa8ae0e65798bfeb98d5328f00ef
commit 5fa6386a4753aa8ae0e65798bfeb98d5328f00ef
Merge: 6e08230 bf73e75
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Aug 17 07:38:45 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Aug 17 07:38:45 2011 -0400

    Merge topic 'generate_export_header' into next
    
    bf73e75 Hopefully add version extraction for Intel.
    aa4f0b6 Fix the version extraction regex for clang.
    a493d1a Test the correct cxx variable.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bf73e759413d33f7d2950ecb46530cffebfbd333
commit bf73e759413d33f7d2950ecb46530cffebfbd333
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Aug 17 13:37:57 2011 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Aug 17 13:37:57 2011 +0200

    Hopefully add version extraction for Intel.

diff --git a/Tests/Module/CheckCXXCompilerFlag/CMakeLists.txt b/Tests/Module/CheckCXXCompilerFlag/CMakeLists.txt
index 7d52912..0133f8e 100644
--- a/Tests/Module/CheckCXXCompilerFlag/CMakeLists.txt
+++ b/Tests/Module/CheckCXXCompilerFlag/CMakeLists.txt
@@ -28,10 +28,16 @@ if(CMAKE_CXX_COMPILER_ID MATCHES Clang)
   string (REGEX REPLACE ".*version ([0-9]\\.[0-9]).*" "\\1" _clang_version "${_clang_version_info}")
 endif()
 
+if(CMAKE_CXX_COMPILER_ID MATCHES Intel)
+  exec_program(${CMAKE_CXX_COMPILER} ARGS -V OUTPUT_VARIABLE     _intel_version_info)
+  string (REGEX REPLACE ".*Version ([0-9]+(\\.[0-9]+)+).*" _intel_version "${_intel_version_info}")
+endif()
+
 message("Platform:\n  WIN32: ${WIN32}\n  UNIX: ${UNIX}\n  APPLE: ${APPLE}\n  MINGW: ${MINGW}\n  CYGWIN: ${CYGWIN}\n"
   "  MSVC: ${MSVC}\n  MSVC60: ${MSVC60}\n  MSVC70: ${MSVC70}\n  MSVC71: ${MSVC71}\n  MSVC80: ${MSVC80}\n  MSVC90: ${MSVC90}\n  MSVC10: ${MSVC10}\n"
   "  GCC: ${_gcc_version}\n"
   "  Clang: ${_clang_version}\n"
+  "  Intel: ${_intel_version}\n"
 )
 
 include(CheckCXXCompilerFlag)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aa4f0b6ba813c69e73d66c51ece183e8e97f622b
commit aa4f0b6ba813c69e73d66c51ece183e8e97f622b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Aug 17 13:32:48 2011 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Aug 17 13:32:48 2011 +0200

    Fix the version extraction regex for clang.

diff --git a/Tests/Module/CheckCXXCompilerFlag/CMakeLists.txt b/Tests/Module/CheckCXXCompilerFlag/CMakeLists.txt
index fcffa87..7d52912 100644
--- a/Tests/Module/CheckCXXCompilerFlag/CMakeLists.txt
+++ b/Tests/Module/CheckCXXCompilerFlag/CMakeLists.txt
@@ -25,7 +25,7 @@ endif()
 
 if(CMAKE_CXX_COMPILER_ID MATCHES Clang)
   exec_program(${CMAKE_CXX_COMPILER} ARGS --version OUTPUT_VARIABLE     _clang_version_info)
-  string (REGEX MATCH "version [345]\\.[0-9]" _clang_version "${_clang_version_info}")
+  string (REGEX REPLACE ".*version ([0-9]\\.[0-9]).*" "\\1" _clang_version "${_clang_version_info}")
 endif()
 
 message("Platform:\n  WIN32: ${WIN32}\n  UNIX: ${UNIX}\n  APPLE: ${APPLE}\n  MINGW: ${MINGW}\n  CYGWIN: ${CYGWIN}\n"

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a493d1a35305d26e9c360f82b969adde1dfd64ae
commit a493d1a35305d26e9c360f82b969adde1dfd64ae
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Aug 17 13:32:20 2011 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Aug 17 13:32:20 2011 +0200

    Test the correct cxx variable.

diff --git a/Tests/Module/CheckCXXCompilerFlag/CMakeLists.txt b/Tests/Module/CheckCXXCompilerFlag/CMakeLists.txt
index 8294c8f..fcffa87 100644
--- a/Tests/Module/CheckCXXCompilerFlag/CMakeLists.txt
+++ b/Tests/Module/CheckCXXCompilerFlag/CMakeLists.txt
@@ -23,7 +23,7 @@ if(CMAKE_COMPILER_IS_GNUCXX)
   endif()
 endif()
 
-if(CMAKE_COMPILER_ID MATCHES Clang)
+if(CMAKE_CXX_COMPILER_ID MATCHES Clang)
   exec_program(${CMAKE_CXX_COMPILER} ARGS --version OUTPUT_VARIABLE     _clang_version_info)
   string (REGEX MATCH "version [345]\\.[0-9]" _clang_version "${_clang_version_info}")
 endif()

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

Summary of changes:
 Tests/Module/CheckCXXCompilerFlag/CMakeLists.txt |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake