[Cmake-commits] CMake branch, next, updated. v2.8.2-919-ge3279af

[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  e3279afebeb6ed4aa3b11b3506e9b3ad21250185 (commit)
       via  25931ae10ed6b3bddc242ace16bed82dd2683596 (commit)
      from  061bf6c2e67d56e41162142b8f27020e5bfb9cb7 (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=e3279afebeb6ed4aa3b11b3506e9b3ad21250185
commit e3279afebeb6ed4aa3b11b3506e9b3ad21250185
Merge: 061bf6c 25931ae
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Thu Sep 23 16:53:26 2010 -0600
Commit:     Clinton Stimpson <clinton at elemtech.com>
CommitDate: Thu Sep 23 16:53:26 2010 -0600

    Merge branch 'findqt4-cross-compile' into next


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=25931ae10ed6b3bddc242ace16bed82dd2683596
commit 25931ae10ed6b3bddc242ace16bed82dd2683596
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Thu Sep 23 16:50:09 2010 -0600
Commit:     Clinton Stimpson <clinton at elemtech.com>
CommitDate: Thu Sep 23 16:50:09 2010 -0600

    Fix regression in cross-compile patches with finding Qt libs.
    
    If a Qt installation is in CMAKE_PREFIX_PATH and a
    QT_QMAKE_EXECUTABLE points to a qmake for a different Qt installation,
    prefer finding libs in the latter Qt installation.

diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
index 0a813a4..c939ddc 100644
--- a/Modules/FindQt4.cmake
+++ b/Modules/FindQt4.cmake
@@ -602,10 +602,12 @@ IF (QT4_QMAKE_FOUND)
     FIND_LIBRARY(QT_QTCORE_LIBRARY_RELEASE
                  NAMES QtCore${QT_LIBINFIX} QtCore${QT_LIBINFIX}4
                  HINTS ${QT_LIBRARY_DIR_TMP}
+                 NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH NO_SYSTEM_ENVIRONMENT_PATH
         )
     FIND_LIBRARY(QT_QTCORE_LIBRARY_DEBUG
                  NAMES QtCore${QT_LIBINFIX}_debug QtCore${QT_LIBINFIX}d QtCore${QT_LIBINFIX}d4
                  HINTS ${QT_LIBRARY_DIR_TMP}
+                 NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH NO_SYSTEM_ENVIRONMENT_PATH
         )
 
     # try dropping a hint if trying to use Visual Studio with Qt built by mingw
@@ -630,7 +632,7 @@ IF (QT4_QMAKE_FOUND)
     SET(QT_QTCORE_FOUND 1)
   ELSE()
     MESSAGE("Warning: QT_QMAKE_EXECUTABLE reported QT_INSTALL_LIBS as ${QT_LIBRARY_DIR_TMP}")
-    MESSAGE("Warning: But QtCore couldn't be found.  Qt must NOT be installed correctly.")
+    MESSAGE("Warning: But QtCore couldn't be found.  Qt must NOT be installed correctly, or it wasn't found for cross compiling.")
     IF(Qt4_FIND_REQUIRED)
       MESSAGE( FATAL_ERROR "Could NOT find QtCore. Check ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log for more details.")
     ENDIF(Qt4_FIND_REQUIRED)

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

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


hooks/post-receive
-- 
CMake