[Cmake-commits] CMake branch, next, updated. v2.8.7-2701-g946ea33

Rolf Eike Beer eike at sf-mail.de
Sat Feb 18 10:23:43 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  946ea3392e481dc1c20bafbce20af8f12e273f6b (commit)
       via  e7ea895e35c45db32d057fb208c28b34224affe3 (commit)
      from  57bcbdd4b7d1537653257f559fb847eae74d7a01 (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=946ea3392e481dc1c20bafbce20af8f12e273f6b
commit 946ea3392e481dc1c20bafbce20af8f12e273f6b
Merge: 57bcbdd e7ea895
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sat Feb 18 10:23:42 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Feb 18 10:23:42 2012 -0500

    Merge topic 'improve-findfreetype' into next
    
    e7ea895 Revert "AllFindModules test: be strict about FREETYPE and LibXslt version"


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

    Revert "AllFindModules test: be strict about FREETYPE and LibXslt version"
    
    This reverts commit bb1ba19ed73ef1e5dce10c69adbf57daa83b683b.
    
    This will go in through it's own branch to avoid collisions.

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

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

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


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list