diff options
| author | David Cole <david.cole@kitware.com> | 2012-08-20 19:42:25 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-08-20 19:42:25 (GMT) |
| commit | 19e210af90d943548e7f07759030a2dd2cc8a2a4 (patch) | |
| tree | d7f195f093ea752a6ba348982d9f285858e0d5c5 | |
| parent | 0afaedfb4a500e6acb215367a1b37c22c2ff3c37 (diff) | |
| parent | 637207e62af7e6104dd8328c182d18870f1b155b (diff) | |
| download | CMake-19e210af90d943548e7f07759030a2dd2cc8a2a4.zip CMake-19e210af90d943548e7f07759030a2dd2cc8a2a4.tar.gz CMake-19e210af90d943548e7f07759030a2dd2cc8a2a4.tar.bz2 | |
Merge topic 'no-regex-escape-space'
637207e do not escape spaces in regular expressions
| -rw-r--r-- | Docs/bash-completion/cpack | 2 | ||||
| -rw-r--r-- | Modules/CPackRPM.cmake | 2 | ||||
| -rw-r--r-- | Modules/FindArmadillo.cmake | 2 |
3 files changed, 3 insertions, 3 deletions
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() |