[Cmake-commits] CMake branch, next, updated. v2.8.7-2392-gbacfff6

[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  bacfff625c54e1f9991f27480baef6e25681bc7d (commit)
       via  0b17c6909deafcb5f94527e267a94be7c6dcb9e7 (commit)
      from  8c2f3c7ebd6225afe5d08043924f3dbf09eea701 (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=bacfff625c54e1f9991f27480baef6e25681bc7d
commit bacfff625c54e1f9991f27480baef6e25681bc7d
Merge: 8c2f3c7 0b17c69
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Wed Feb 1 12:09:19 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 1 12:09:19 2012 -0500

    Merge topic 'AllFindModules-test' into next
    
    0b17c69 AllFindModules test: check *_VERSION_STRING first


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0b17c6909deafcb5f94527e267a94be7c6dcb9e7
commit 0b17c6909deafcb5f94527e267a94be7c6dcb9e7
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Wed Feb 1 18:09:07 2012 +0100
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Wed Feb 1 18:09:07 2012 +0100

    AllFindModules test: check *_VERSION_STRING first

diff --git a/Tests/CMakeOnly/AllFindModules/CMakeLists.txt b/Tests/CMakeOnly/AllFindModules/CMakeLists.txt
index 468472b..127e9d7 100644
--- a/Tests/CMakeOnly/AllFindModules/CMakeLists.txt
+++ b/Tests/CMakeOnly/AllFindModules/CMakeLists.txt
@@ -53,14 +53,14 @@ set(VERSIONS_REQUIRED
 
 foreach(VTEST ${VERSIONS_REQUIRED})
     if (${VTEST}_FOUND)
-        if (DEFINED ${VTEST}_VERSION)
-            if (NOT ${VTEST}_VERSION MATCHES "^[0-9][0-9\\.]*[A-Za-z_]*[0-9\\.]*$")
-                message(SEND_ERROR "${VTEST}_VERSION has unexpected content ${${VTEST}_VERSION}")
-            endif()
-        elseif (DEFINED ${VTEST}_VERSION_STRING)
+        if (DEFINED ${VTEST}_VERSION_STRING)
             if (NOT ${VTEST}_VERSION_STRING MATCHES "^[0-9][0-9\\.]*[A-Za-z_]*[0-9\\.]*$")
                 message(SEND_ERROR "${VTEST}_VERSION_STRING has unexpected content ${${VTEST}_VERSION_STRING}")
             endif()
+        elseif (DEFINED ${VTEST}_VERSION)
+            if (NOT ${VTEST}_VERSION MATCHES "^[0-9][0-9\\.]*[A-Za-z_]*[0-9\\.]*$")
+                message(SEND_ERROR "${VTEST}_VERSION has unexpected content ${${VTEST}_VERSION}")
+            endif()
         else()
             message(SEND_ERROR "${VTEST}_FOUND is set but no version number is defined")
         endif()

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

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


hooks/post-receive
-- 
CMake