[Cmake-commits] CMake branch, next, updated. v2.8.5-1753-g41bd091

[Clinton Stimpson]

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  41bd091d50250de974d9fbe8f30bddc00618973c (commit)
       via  a67be31784ca6e2683fb5b86988bc5c81680c07c (commit)
      from  de0bd3ff7a4097961fe1b529f2723d6009ac403b (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=41bd091d50250de974d9fbe8f30bddc00618973c
commit 41bd091d50250de974d9fbe8f30bddc00618973c
Merge: de0bd3f a67be31
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Mon Aug 29 10:24:34 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Aug 29 10:24:34 2011 -0400

    Merge topic 'qt4-find-uitools-mingw-cross' into next
    
    a67be31 qt4: also find QtUiTools when cross compiling with mingw.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a67be31784ca6e2683fb5b86988bc5c81680c07c
commit a67be31784ca6e2683fb5b86988bc5c81680c07c
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Mon Aug 29 08:23:44 2011 -0600
Commit:     Clinton Stimpson <clinton at elemtech.com>
CommitDate: Mon Aug 29 08:23:44 2011 -0600

    qt4: also find QtUiTools when cross compiling with mingw.

diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
index 1ebd69d..3b05c2b 100644
--- a/Modules/FindQt4.cmake
+++ b/Modules/FindQt4.cmake
@@ -862,10 +862,11 @@ IF (QT_QMAKE_EXECUTABLE AND QTVERSION)
         )
   ENDFOREACH(QT_MODULE)
 
-  # QtUiTools not with other frameworks with binary installation (in /usr/lib)
-  IF(Q_WS_MAC AND QT_QTCORE_LIBRARY_RELEASE AND NOT QT_QTUITOOLS_LIBRARY_RELEASE)
+  # QtUiTools is sometimes not in the same directory as the other found libraries
+  # e.g. on Mac, its never a framework like the others are
+  IF(QT_QTCORE_LIBRARY_RELEASE AND NOT QT_QTUITOOLS_LIBRARY_RELEASE)
     FIND_LIBRARY(QT_QTUITOOLS_LIBRARY_RELEASE NAMES QtUiTools${QT_LIBINFIX} PATHS ${QT_LIBRARY_DIR})
-  ENDIF(Q_WS_MAC AND QT_QTCORE_LIBRARY_RELEASE AND NOT QT_QTUITOOLS_LIBRARY_RELEASE)
+  ENDIF(QT_QTCORE_LIBRARY_RELEASE AND NOT QT_QTUITOOLS_LIBRARY_RELEASE)
 
   # Set QT_QTDESIGNERCOMPONENTS_LIBRARY
   FIND_LIBRARY(QT_QTDESIGNERCOMPONENTS_LIBRARY_RELEASE NAMES QtDesignerComponents${QT_LIBINFIX} QtDesignerComponents${QT_LIBINFIX}4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)

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

Summary of changes:
 Modules/FindQt4.cmake |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake