[Cmake-commits] CMake branch, next, updated. v2.8.9-147-g1f2b57c

[Rolf Eike Beer]

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  1f2b57c748efffdb96fcbe198ec212bc717e4ae3 (commit)
       via  637207e62af7e6104dd8328c182d18870f1b155b (commit)
       via  d46f8afae98cd8f50cff9915a5a9dc680b9e0518 (commit)
      from  fd7fa92fb1e2d7dd87c526a1855acf34b01bf41c (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=1f2b57c748efffdb96fcbe198ec212bc717e4ae3
commit 1f2b57c748efffdb96fcbe198ec212bc717e4ae3
Merge: fd7fa92 637207e
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sun Aug 19 06:08:15 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Aug 19 06:08:15 2012 -0400

    Merge topic 'no-regex-escape-space' into next
    
    637207e do not escape spaces in regular expressions
    d46f8af CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=637207e62af7e6104dd8328c182d18870f1b155b
commit 637207e62af7e6104dd8328c182d18870f1b155b
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sun Aug 19 11:49:56 2012 +0200
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Sun Aug 19 11:49:56 2012 +0200

    do not escape spaces in regular expressions
    
    The space has no special meaning in regular expressions so it doesn't need to
    be escaped.

diff --git a/Docs/bash-completion/cpack b/Docs/bash-completion/cpack
index 84dcfd5..a0c1f83 100644
--- a/Docs/bash-completion/cpack
+++ b/Docs/bash-completion/cpack
@@ -8,7 +8,7 @@ _cpack()
     case "$prev" in
         -G)
             COMPREPLY=( $( compgen -W '$( cpack --help 2>/dev/null |
-                grep "^  .*=\ .*" 2> /dev/null | grep -v "^  -" 2>/dev/null |
+                grep "^  .*= .*" 2> /dev/null | grep -v "^  -" 2>/dev/null |
                 cut -d" " -f 3 )' -- "$cur" ) )
             return
             ;;
diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index 066b295..b5826ef 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -259,7 +259,7 @@ if(RPMBUILD_EXECUTABLE)
                   OUTPUT_VARIABLE _TMP_VERSION
                   ERROR_QUIET
                   OUTPUT_STRIP_TRAILING_WHITESPACE)
-  string(REGEX REPLACE "^.*\ " ""
+  string(REGEX REPLACE "^.* " ""
          RPMBUILD_EXECUTABLE_VERSION
          ${_TMP_VERSION})
   if(CPACK_RPM_PACKAGE_DEBUG)
diff --git a/Modules/FindArmadillo.cmake b/Modules/FindArmadillo.cmake
index aad22d2..ebbdb0a 100644
--- a/Modules/FindArmadillo.cmake
+++ b/Modules/FindArmadillo.cmake
@@ -64,7 +64,7 @@ if(ARMADILLO_INCLUDE_DIR)
     string(REGEX REPLACE ".*#define ARMA_VERSION_PATCH ([0-9]+).*" "\\1" ARMADILLO_VERSION_PATCH "${_armadillo_HEADER_CONTENTS}")
 
     # WARNING: The number of spaces before the version name is not one.
-    string(REGEX REPLACE ".*#define ARMA_VERSION_NAME\ +\"([0-9a-zA-Z\ _-]+)\".*" "\\1" ARMADILLO_VERSION_NAME "${_armadillo_HEADER_CONTENTS}")
+    string(REGEX REPLACE ".*#define ARMA_VERSION_NAME +\"([0-9a-zA-Z _-]+)\".*" "\\1" ARMADILLO_VERSION_NAME "${_armadillo_HEADER_CONTENTS}")
 
   endif()
 

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

Summary of changes:
 Docs/bash-completion/cpack  |    2 +-
 Modules/CPackRPM.cmake      |    2 +-
 Modules/FindArmadillo.cmake |    2 +-
 Source/CMakeVersion.cmake   |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake