[Cmake-commits] CMake branch, next, updated. v2.8.7-2907-gaad5eb6

Rolf Eike Beer eike at sf-mail.de
Mon Feb 27 11:24:33 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  aad5eb6d698bc644ee21048b55a118060ee2f072 (commit)
       via  38066d5e1d2e7f2096430bf37adb0d3638f1a61a (commit)
      from  83d76962e48194081f991de839351b85e9e42721 (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=aad5eb6d698bc644ee21048b55a118060ee2f072
commit aad5eb6d698bc644ee21048b55a118060ee2f072
Merge: 83d7696 38066d5
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Mon Feb 27 11:24:30 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 27 11:24:30 2012 -0500

    Merge topic 'allfindmodules-versions' into next
    
    38066d5 AllFindModules test: once again expand version checking


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=38066d5e1d2e7f2096430bf37adb0d3638f1a61a
commit 38066d5e1d2e7f2096430bf37adb0d3638f1a61a
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Fri Feb 24 20:35:42 2012 +0100
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Mon Feb 27 17:24:13 2012 +0100

    AllFindModules test: once again expand version checking

diff --git a/Tests/CMakeOnly/AllFindModules/CMakeLists.txt b/Tests/CMakeOnly/AllFindModules/CMakeLists.txt
index 9257fcc..ee25c5a 100644
--- a/Tests/CMakeOnly/AllFindModules/CMakeLists.txt
+++ b/Tests/CMakeOnly/AllFindModules/CMakeLists.txt
@@ -45,25 +45,31 @@ if (NOT QT4_FOUND)
     endforeach(FIND_MODULE)
 endif (NOT QT4_FOUND)
 
-# If any of these modules reported that it was found a version number should have been
-# reported.
-set(VERSIONS_REQUIRED
-    ALSA BISON BZIP2 CUPS CURL DOXYGEN EXPAT FLEX FREETYPE GETTEXT GIF GIT
-    ImageMagick JASPER LibArchive LIBXML2 LIBXSLT PERL PKG_CONFIG PostgreSQL
-    SWIG TIFF ZLIB)
-
-foreach(VTEST ${VERSIONS_REQUIRED})
-    if (${VTEST}_FOUND)
-        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}")
+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\\.]*$")
+                message(SEND_ERROR "${VERSION_VAR} has unexpected content ${${VERSION_VAR}}")
             endif()
         else()
-            message(SEND_ERROR "${VTEST}_FOUND is set but no version number is defined")
+            message(SEND_ERROR "${MODULE_NAME}_FOUND is set but no version number is defined")
         endif()
-    endif(${VTEST}_FOUND)
+    endif ()
+endmacro(check_version_string)
+
+# If any of these modules reported that it was found a version number should have been
+# reported.
+
+foreach(VTEST ALSA ARMADILLO BZIP2 CUPS CURL EXPAT FREETYPE GETTEXT GIT HSPELL
+        ImageMagick JASPER LIBXML2 LIBXSLT PERL PostgreSQL TCLSH TIFF ZLIB)
+    check_version_string(${VTEST} ${VTEST}_VERSION_STRING)
 endforeach(VTEST)
+
+foreach(VTEST BISON Boost CUDA DOXYGEN FLEX GIF GTK2 LibArchive OPENSCENEGRAPH
+        RUBY SWIG)
+    check_version_string(${VTEST} ${VTEST}_VERSION)
+endforeach(VTEST)
+
+check_version_string(PYTHONINTERP PYTHON_VERSION_STRING)
+check_version_string(SUBVERSION Subversion_VERSION_SVN)
+check_version_string(PKGCONFIG PKG_CONFIG_VERSION_STRING)

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

Summary of changes:


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list