[Cmake-commits] CMake branch, next, updated. v2.8.7-2580-gcf96004

Rolf Eike Beer eike at sf-mail.de
Mon Feb 13 12:51:09 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  cf960046396993632d9b7c153af099984f801844 (commit)
       via  2f306a999203d7a894e5bace90d176ce525f6444 (commit)
      from  5a6e4e264ce50dfd8e21bc00c9938d6f9e408536 (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=cf960046396993632d9b7c153af099984f801844
commit cf960046396993632d9b7c153af099984f801844
Merge: 5a6e4e2 2f306a9
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Mon Feb 13 12:50:56 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 13 12:50:56 2012 -0500

    Merge topic 'allfindmodules-no-force-gnuplot' into next
    
    2f306a9 AllFindModules test: do not enforce GNUPLOT version


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2f306a999203d7a894e5bace90d176ce525f6444
commit 2f306a999203d7a894e5bace90d176ce525f6444
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Mon Feb 13 18:45:38 2012 +0100
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Mon Feb 13 18:45:38 2012 +0100

    AllFindModules test: do not enforce GNUPLOT version
    
    Ancient Gnuplot versions like 3.7.1 don't know about "--version". Disable this
    check so it doesn't break on machines with this version.

diff --git a/Tests/CMakeOnly/AllFindModules/CMakeLists.txt b/Tests/CMakeOnly/AllFindModules/CMakeLists.txt
index 127e9d7..f76f0d9 100644
--- a/Tests/CMakeOnly/AllFindModules/CMakeLists.txt
+++ b/Tests/CMakeOnly/AllFindModules/CMakeLists.txt
@@ -48,7 +48,7 @@ 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 GETTEXT GIF GIT GNUPLOT
+    ALSA BISON BZIP2 CUPS CURL DOXYGEN EXPAT FLEX GETTEXT GIF GIT
     ImageMagick JASPER LibArchive LIBXML2 PERL PostgreSQL SWIG TIFF ZLIB)
 
 foreach(VTEST ${VERSIONS_REQUIRED})

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

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