[Cmake-commits] CMake branch, next, updated. v2.8.3-579-gff6e3cb

[Alexander Neundorf]

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  ff6e3cb9ff400cce86597d9be2ef57b15163ddbf (commit)
       via  a39ee97c6cfe19e2170e0e5eccbfb8b1be3b1f48 (commit)
       via  c8f6c33ec8a9bb9372bf9c800699e6cfd19533b7 (commit)
       via  e3b1dc171d2a71439830b1656bad5349171c17f4 (commit)
       via  01decafc9719030c3970ddd4861b7819f79adff6 (commit)
       via  b5f9be1d03deb7be87a615e8d3bb89ecf341e288 (commit)
       via  8eaf17227993dd736e1ff27e373557ced07d8351 (commit)
       via  1774622487bde44967d6c3181780e6705acf1b9d (commit)
       via  9692d5a2b6f706f8b3cfd31fcb5b47277961ccab (commit)
       via  384816e4deb5e171e4a0651ef08c2af9c59b356a (commit)
       via  5965ff51127c7baaa23b06df510c8adcc5435880 (commit)
       via  b5a46cab851fd0fce570d168f81ae0adfa32b33d (commit)
       via  5aa72c6374c905ec972c48ee3b25c06d2949f117 (commit)
       via  d8e0bfa7863f817cd226eca65626525f6b1d1f57 (commit)
      from  70243a4a00785ac8ed4b4a2470416cefa21ba89e (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=ff6e3cb9ff400cce86597d9be2ef57b15163ddbf
commit ff6e3cb9ff400cce86597d9be2ef57b15163ddbf
Merge: 70243a4 a39ee97
Author:     Alex Neundorf <neundorf at kde.org>
AuthorDate: Tue Nov 9 21:52:52 2010 +0100
Commit:     Alex Neundorf <neundorf at kde.org>
CommitDate: Tue Nov 9 21:52:52 2010 +0100

    Merge branch 'FixFindQt3REQUIRED' into next


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a39ee97c6cfe19e2170e0e5eccbfb8b1be3b1f48
commit a39ee97c6cfe19e2170e0e5eccbfb8b1be3b1f48
Author:     Alex Neundorf <neundorf at kde.org>
AuthorDate: Tue Nov 9 21:51:59 2010 +0100
Commit:     Alex Neundorf <neundorf at kde.org>
CommitDate: Tue Nov 9 21:51:59 2010 +0100

    Fix #11421: FindQt3.cmake doesn't honor the REQUIRED keyword
    
    Alex

diff --git a/Modules/FindQt3.cmake b/Modules/FindQt3.cmake
index 3606a5f..1319de2 100644
--- a/Modules/FindQt3.cmake
+++ b/Modules/FindQt3.cmake
@@ -242,9 +242,9 @@ IF (QT_MIN_VERSION)
 ENDIF (QT_MIN_VERSION)
 
 # if the include a library are found then we have it
-IF(QT_INCLUDE_DIR AND QT_QT_LIBRARY)
-  SET( QT_FOUND "YES" )
-ENDIF(QT_INCLUDE_DIR AND QT_QT_LIBRARY)
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Qt3  DEFAULT_MSG  QT_QT_LIBRARY QT_INCLUDE_DIR QT_MOC_EXECUTABLE)
+SET(QT_FOUND ${QT3_FOUND} )
 
 IF(QT_FOUND)
   SET( QT_LIBRARIES ${QT_LIBRARIES} ${QT_QT_LIBRARY} )

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

Summary of changes:
 Modules/FindQt3.cmake              |    6 +++---
 Source/kwsys/SystemInformation.cxx |   21 +++++++++++++++------
 2 files changed, 18 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
CMake