[Cmake-commits] CMake branch, next, updated. v2.8.7-2905-g83d7696

Rolf Eike Beer eike at sf-mail.de
Mon Feb 27 11:24:03 EST 2012


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  83d76962e48194081f991de839351b85e9e42721 (commit)
       via  3951c9958d4ce250dbf6bd3eeb51b83de76312b5 (commit)
      from  ac678983ec7eefc465ec51e29cbb067b95e244a7 (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=83d76962e48194081f991de839351b85e9e42721
commit 83d76962e48194081f991de839351b85e9e42721
Merge: ac67898 3951c99
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Mon Feb 27 11:23:59 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 27 11:23:59 2012 -0500

    Merge topic 'allfindmodules-versions' into next
    
    3951c99 AllFindModules test: fix regex


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3951c9958d4ce250dbf6bd3eeb51b83de76312b5
commit 3951c9958d4ce250dbf6bd3eeb51b83de76312b5
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Mon Feb 27 17:23:48 2012 +0100
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Mon Feb 27 17:23:48 2012 +0100

    AllFindModules test: fix regex

diff --git a/Tests/CMakeOnly/AllFindModules/CMakeLists.txt b/Tests/CMakeOnly/AllFindModules/CMakeLists.txt
index 0272f93..ee25c5a 100644
--- a/Tests/CMakeOnly/AllFindModules/CMakeLists.txt
+++ b/Tests/CMakeOnly/AllFindModules/CMakeLists.txt
@@ -48,7 +48,7 @@ endif (NOT QT4_FOUND)
 macro(check_version_string MODULE_NAME VERSION_VAR)
     if (${MODULE_NAME}_FOUND)
         if (DEFINED ${VERSION_VAR})
-            if (NOT ${VERSION_VAR} MATCHES "^[0-9][0-9\\.]*[A-Za-z_\\-\\+]*[0-9\\.]*$")
+            if (NOT ${VERSION_VAR} MATCHES "^[0-9][0-9\\.]*[-A-Za-z_\\+]*[0-9\\.]*$")
                 message(SEND_ERROR "${VERSION_VAR} has unexpected content ${${VERSION_VAR}}")
             endif()
         else()

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

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


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list