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 d206692d547369f4b7628041d3ce8c0f3f023c14 (commit) via 30461bd6d7a0fadff9bbf5b2f193dd7f461acb8f (commit) via 4ce8cce455297c1f03027afee8158520b9240fd5 (commit) from 1c9530453535b6598047e2e50e2d4a3855174f2b (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=d206692d547369f4b7628041d3ce8c0f3f023c14 commit d206692d547369f4b7628041d3ce8c0f3f023c14 Merge: 1c95304 30461bd Author: Rolf Eike Beer <e...@sf-mail.de> AuthorDate: Fri Jan 27 15:58:22 2012 -0500 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Fri Jan 27 15:58:22 2012 -0500 Merge topic 'version-extra-debugging' into next 30461bd CMakeOnly.AllFindModules: require version information for some modules 4ce8cce Merge branch 'AllFindModules-test' into version-extra-debugging http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=30461bd6d7a0fadff9bbf5b2f193dd7f461acb8f commit 30461bd6d7a0fadff9bbf5b2f193dd7f461acb8f Author: Rolf Eike Beer <e...@sf-mail.de> AuthorDate: Fri Jan 27 21:58:00 2012 +0100 Commit: Rolf Eike Beer <e...@sf-mail.de> CommitDate: Fri Jan 27 21:58:00 2012 +0100 CMakeOnly.AllFindModules: require version information for some modules Those modules should always find a valid version number if they find the software installed. Add extra checks to get noticed immediately if that fails. diff --git a/Tests/CMakeOnly/AllFindModules/CMakeLists.txt b/Tests/CMakeOnly/AllFindModules/CMakeLists.txt index 308177d..0bc7d54 100644 --- a/Tests/CMakeOnly/AllFindModules/CMakeLists.txt +++ b/Tests/CMakeOnly/AllFindModules/CMakeLists.txt @@ -44,3 +44,25 @@ if (NOT QT4_FOUND) do_find(${FIND_MODULE}) 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 + BISON BZIP2 CUPS CURL DOXYGEN EXPAT FLEX GETTEXT GIF GIT GNUTLS + LIBXML2 PERL PostgreSQL SWIG ZLIB) + +foreach(VTEST ${VERSIONS_REQUIRED}) + if (${VTEST}_FOUND) + if (DEFINED ${VTEST}_VERSION) + if (NOT ${VTEST}_VERSION MATCHES "^[0-9]([0-9A-Za-z\\.]*)$") + message(SEND_ERROR "${VTEST}_VERSION has unexpected content ${${VTEST}_VERSION}") + endif() + elseif (DEFINED ${VTEST}_VERSION_STRING) + if (NOT ${VTEST}_VERSION_STRING MATCHES "^[0-9][0-9\\.]*[A-Za-z]*$") + message(SEND_ERROR "${VTEST}_VERSION_STRING has unexpected content ${${VTEST}_VERSION_STRING}") + endif() + else() + message(SEND_ERROR "${VTEST}_FOUND is set but no version number is defined") + endif() + endif(${VTEST}_FOUND) +endforeach(VTEST) http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4ce8cce455297c1f03027afee8158520b9240fd5 commit 4ce8cce455297c1f03027afee8158520b9240fd5 Merge: 47bb720 2dee929 Author: Rolf Eike Beer <e...@sf-mail.de> AuthorDate: Fri Jan 27 21:57:28 2012 +0100 Commit: Rolf Eike Beer <e...@sf-mail.de> CommitDate: Fri Jan 27 21:57:28 2012 +0100 Merge branch 'AllFindModules-test' into version-extra-debugging ----------------------------------------------------------------------- Summary of changes: Tests/CMakeOnly/AllFindModules/CMakeLists.txt | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits