[Cmake-commits] CMake branch, next, updated. v2.8.5-1640-g493d4f7

[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  493d4f7a0c747f47f48fa67b6260ce483f7831ce (commit)
       via  42154ec01cc6250097880c6c13ea5bba88e3a6b0 (commit)
      from  daf795ff1e7d44bc0ee6e896ac5395a596af4cb1 (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=493d4f7a0c747f47f48fa67b6260ce483f7831ce
commit 493d4f7a0c747f47f48fa67b6260ce483f7831ce
Merge: daf795f 42154ec
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Aug 18 07:30:19 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Aug 18 07:30:19 2011 -0400

    Merge topic 'generate_export_header' into next
    
    42154ec Fix up the regex command for Intel.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=42154ec01cc6250097880c6c13ea5bba88e3a6b0
commit 42154ec01cc6250097880c6c13ea5bba88e3a6b0
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Aug 18 13:29:06 2011 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Aug 18 13:29:06 2011 +0200

    Fix up the regex command for Intel.

diff --git a/Tests/Module/CheckCXXCompilerFlag/CMakeLists.txt b/Tests/Module/CheckCXXCompilerFlag/CMakeLists.txt
index fa48a48..77f5006 100644
--- a/Tests/Module/CheckCXXCompilerFlag/CMakeLists.txt
+++ b/Tests/Module/CheckCXXCompilerFlag/CMakeLists.txt
@@ -33,7 +33,7 @@ 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}")
+  string (REGEX REPLACE ".*Version ([0-9]+(\\.[0-9]+)+).*" "\\1" _intel_version "${_intel_version_info}")
 endif()
 
 message("Platform:\n  WIN32: ${WIN32}\n  UNIX: ${UNIX}\n  APPLE: ${APPLE}\n  MINGW: ${MINGW}\n  CYGWIN: ${CYGWIN}\n"

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

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


hooks/post-receive
-- 
CMake