[Cmake-commits] CMake branch, next, updated. v2.8.7-2346-g37b84fa
Rolf Eike Beer
eike at sf-mail.de
Sat Jan 28 12:18:28 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 37b84fac1c5c4dda2f56b62404d639be7fe66493 (commit)
via 63b3623cce80bde467447b1c8b96b6090b3eb273 (commit)
via 3984fcb5f7dbf834480d42b1eb0cd9c57167ac3d (commit)
from 98e97f013a88d8e0a1feb83d677c6b657712b23a (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=37b84fac1c5c4dda2f56b62404d639be7fe66493
commit 37b84fac1c5c4dda2f56b62404d639be7fe66493
Merge: 98e97f0 63b3623
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sat Jan 28 12:18:16 2012 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Jan 28 12:18:16 2012 -0500
Merge topic 'version-extra-debugging' into next
63b3623 remove debugging code from FindGettext.cmake
3984fcb add more required versions
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=63b3623cce80bde467447b1c8b96b6090b3eb273
commit 63b3623cce80bde467447b1c8b96b6090b3eb273
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sat Jan 28 18:15:54 2012 +0100
Commit: Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Sat Jan 28 18:15:54 2012 +0100
remove debugging code from FindGettext.cmake
diff --git a/Modules/FindGettext.cmake b/Modules/FindGettext.cmake
index adcca73..635090b 100644
--- a/Modules/FindGettext.cmake
+++ b/Modules/FindGettext.cmake
@@ -50,9 +50,6 @@ IF(GETTEXT_MSGMERGE_EXECUTABLE)
OUTPUT_STRIP_TRAILING_WHITESPACE)
IF (gettext_version MATCHES "^msgmerge \\(.*\\) [0-9]")
STRING(REGEX REPLACE "^msgmerge \\([^\\)]*\\) ([0-9\\.]+[^ \n]*).*" "\\1" GETTEXT_VERSION_STRING "${gettext_version}")
-else()
-message(AUTHOR_WARNING "Module Version ##DEBUGGING##")
-message(AUTHOR_WARNING "raw msgmerge output was: '${gettext_version}'")
ENDIF()
UNSET(gettext_version)
ENDIF(GETTEXT_MSGMERGE_EXECUTABLE)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3984fcb5f7dbf834480d42b1eb0cd9c57167ac3d
commit 3984fcb5f7dbf834480d42b1eb0cd9c57167ac3d
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sat Jan 28 18:13:26 2012 +0100
Commit: Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Sat Jan 28 18:13:26 2012 +0100
add more required versions
diff --git a/Tests/CMakeOnly/AllFindModules/CMakeLists.txt b/Tests/CMakeOnly/AllFindModules/CMakeLists.txt
index a7d6876..0756250 100644
--- a/Tests/CMakeOnly/AllFindModules/CMakeLists.txt
+++ b/Tests/CMakeOnly/AllFindModules/CMakeLists.txt
@@ -49,7 +49,7 @@ endif (NOT QT4_FOUND)
# reported.
set(VERSIONS_REQUIRED
ALSA BISON BZIP2 CUPS CURL DOXYGEN EXPAT FLEX GETTEXT GIF GIT GNUPLOT
- LIBXML2 PERL PostgreSQL SWIG ZLIB)
+ ImageMagick JASPER LibArchive LIBXML2 PERL PostgreSQL SWIG TIFF ZLIB)
foreach(VTEST ${VERSIONS_REQUIRED})
if (${VTEST}_FOUND)
-----------------------------------------------------------------------
Summary of changes:
Modules/FindGettext.cmake | 3 ---
Tests/CMakeOnly/AllFindModules/CMakeLists.txt | 2 +-
2 files changed, 1 insertions(+), 4 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list