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 f0728dd9e2b1fc85a653c124c7245881d79f865f (commit)
via cffce2ffb366cd5c598f56e8f0789124a6d1b7a9 (commit)
from 1e5cac640dcc7afbf73a749fcaea4b134a865045 (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=f0728dd9e2b1fc85a653c124c7245881d79f865f
commit f0728dd9e2b1fc85a653c124c7245881d79f865f
Merge: 1e5cac6 cffce2f
Author: Rolf Eike Beer <e...@sf-mail.de>
AuthorDate: Fri Feb 24 14:35:54 2012 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Fri Feb 24 14:35:54 2012 -0500
Merge topic 'allfindmodules-versions' into next
cffce2f AllFindModules test: once again expand version checking
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cffce2ffb366cd5c598f56e8f0789124a6d1b7a9
commit cffce2ffb366cd5c598f56e8f0789124a6d1b7a9
Author: Rolf Eike Beer <e...@sf-mail.de>
AuthorDate: Fri Feb 24 20:35:42 2012 +0100
Commit: Rolf Eike Beer <e...@sf-mail.de>
CommitDate: Fri Feb 24 20:35:42 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..0272f93 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:
Tests/CMakeOnly/AllFindModules/CMakeLists.txt | 42 ++++++++++++++----------
1 files changed, 24 insertions(+), 18 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
