[Cmake-commits] CMake branch, next, updated. v2.8.9-418-g0550c38

[Rolf Eike Beer]

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  0550c387ed25147c9abc58efece72e2a6726a0d5 (commit)
       via  656ab19b5cbe0f563f72f8219c5670df2351c153 (commit)
      from  ec5b04781d14ee70ef1424a6f8e52ade40495cfe (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=0550c387ed25147c9abc58efece72e2a6726a0d5
commit 0550c387ed25147c9abc58efece72e2a6726a0d5
Merge: ec5b047 656ab19
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sat Sep 8 13:07:02 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Sep 8 13:07:02 2012 -0400

    Merge topic 'gettext-no-duplicate-FPHSA' into next
    
    656ab19 FindGettext: remove code duplicating FPHSA checks


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=656ab19b5cbe0f563f72f8219c5670df2351c153
commit 656ab19b5cbe0f563f72f8219c5670df2351c153
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sat Sep 8 19:06:44 2012 +0200
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Sat Sep 8 19:06:44 2012 +0200

    FindGettext: remove code duplicating FPHSA checks

diff --git a/Modules/FindGettext.cmake b/Modules/FindGettext.cmake
index c4774d9..31bcc61 100644
--- a/Modules/FindGettext.cmake
+++ b/Modules/FindGettext.cmake
@@ -210,11 +210,4 @@ function(GETTEXT_PROCESS_PO_FILES _lang)
 
 endfunction()
 
-if (GETTEXT_MSGMERGE_EXECUTABLE AND GETTEXT_MSGFMT_EXECUTABLE )
-   set(GETTEXT_FOUND TRUE)
-else ()
-   set(GETTEXT_FOUND FALSE)
-   if (GetText_REQUIRED)
-      message(FATAL_ERROR "GetText not found")
-   endif ()
-endif ()
+set(GETTEXT_FOUND ${Gettext_FOUND})

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

Summary of changes:
 Modules/FindGettext.cmake |    9 +--------
 1 files changed, 1 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
CMake