[Cmake-commits] CMake branch, next, updated. v2.8.2-206-gaf1665d

[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  af1665dbec7495f9568eda74fda0a95d8c50e0cb (commit)
       via  ff888dd648cbb5c3d313d11549200fea5569edbb (commit)
      from  bceda51971467484575ef092447cd738bf707669 (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=af1665dbec7495f9568eda74fda0a95d8c50e0cb
commit af1665dbec7495f9568eda74fda0a95d8c50e0cb
Merge: bceda51 ff888dd
Author: Clinton Stimpson <clinton at elemtech.com>
Date:   Tue Jul 6 13:29:18 2010 -0600

    Merge branch 'findqt4-cross-compile' into next


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ff888dd648cbb5c3d313d11549200fea5569edbb
commit ff888dd648cbb5c3d313d11549200fea5569edbb
Author: Clinton Stimpson <clinton at elemtech.com>
Date:   Tue Jul 6 13:24:53 2010 -0600

    Fix some issues with refinding when qmake executable is changed.

diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
index a27b985..1bdf2de 100644
--- a/Modules/FindQt4.cmake
+++ b/Modules/FindQt4.cmake
@@ -430,6 +430,10 @@ MACRO (_QT4_ADJUST_LIB_VARS _camelCaseBasename)
 
     SET(QT_${basename}_FOUND 1)
 
+  ELSE (QT_${basename}_LIBRARY_RELEASE OR QT_${basename}_LIBRARY_DEBUG)
+
+    SET(QT_${basename}_LIBRARY "" CACHE STRING "The Qt ${basename} library" FORCE)
+
   ENDIF (QT_${basename}_LIBRARY_RELEASE OR QT_${basename}_LIBRARY_DEBUG)
 
   IF (QT_${basename}_INCLUDE_DIR)
@@ -567,6 +571,7 @@ IF (QT4_QMAKE_FOUND)
     foreach(qt_cross_path ${CMAKE_FIND_ROOT_PATH})
       set(qt_cross_paths ${qt_cross_paths} "${qt_cross_path}/mkspecs")
     endforeach(qt_cross_path)
+    SET(QT_MKSPECS_DIR NOTFOUND)
     FIND_PATH(QT_MKSPECS_DIR NAMES qconfig.pri
       HINTS ${qt_cross_paths} ${qt_mkspecs_dirs}
       DOC "The location of the Qt mkspecs containing qconfig.pri")
@@ -592,6 +597,8 @@ IF (QT4_QMAKE_FOUND)
       OUTPUT_VARIABLE QT_LIBRARY_DIR_TMP )
     # make sure we have / and not \ as qmake gives on windows
     FILE(TO_CMAKE_PATH "${QT_LIBRARY_DIR_TMP}" QT_LIBRARY_DIR_TMP)
+    SET(QT_QTCORE_LIBRARY_RELEASE NOTFOUND)
+    SET(QT_QTCORE_LIBRARY_DEBUG NOTFOUND)
     FIND_LIBRARY(QT_QTCORE_LIBRARY_RELEASE
                  NAMES QtCore${QT_LIBINFIX} QtCore${QT_LIBINFIX}4
                  HINTS ${QT_LIBRARY_DIR_TMP}

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

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


hooks/post-receive
-- 
CMake