[Cmake-commits] CMake branch, next, updated. v2.8.9-388-g9ec5149

[David Cole]

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  9ec51496f5127dedb5f73d32e9b6370eb221f9d4 (commit)
       via  5c25df10acea6ca2948392d680e6cae26b3127df (commit)
      from  96a741f990bac5212041d2312bce82207be5ae0d (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=9ec51496f5127dedb5f73d32e9b6370eb221f9d4
commit 9ec51496f5127dedb5f73d32e9b6370eb221f9d4
Merge: 96a741f 5c25df1
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Thu Sep 6 16:37:59 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Sep 6 16:37:59 2012 -0400

    Merge topic 'fix-qt-dbus-on-mac-problem' into next
    
    5c25df1 FindQt4: Avoid "finding" non-existent library in a .framework


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5c25df10acea6ca2948392d680e6cae26b3127df
commit 5c25df10acea6ca2948392d680e6cae26b3127df
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Thu Sep 6 15:11:54 2012 -0400
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Thu Sep 6 15:11:54 2012 -0400

    FindQt4: Avoid "finding" non-existent library in a .framework
    
    ...if the library file does not exist inside the .framework then do
    not allow a library variable to be set to the path to the framework.
    Force set it to NOTFOUND instead.

diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
index 95fb8a4..a84074b 100644
--- a/Modules/FindQt4.cmake
+++ b/Modules/FindQt4.cmake
@@ -885,6 +885,18 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION)
                  NAMES ${QT_MODULE}${QT_LIBINFIX}_debug ${QT_MODULE}${QT_LIBINFIX}d ${QT_MODULE}${QT_LIBINFIX}d4
                  PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
         )
+    if(QT_${_upper_qt_module}_LIBRARY_RELEASE MATCHES "/${QT_MODULE}\\.framework$")
+      if(NOT EXISTS "${QT_${_upper_qt_module}_LIBRARY_RELEASE}/${QT_MODULE}")
+        # Release framework library file does not exist... Force to NOTFOUND:
+        set(QT_${_upper_qt_module}_LIBRARY_RELEASE "QT_${_upper_qt_module}_LIBRARY_RELEASE-NOTFOUND" CACHE FILEPATH "Path to a library." FORCE)
+      endif()
+    endif()
+    if(QT_${_upper_qt_module}_LIBRARY_DEBUG MATCHES "/${QT_MODULE}\\.framework$")
+      if(NOT EXISTS "${QT_${_upper_qt_module}_LIBRARY_DEBUG}/${QT_MODULE}")
+        # Debug framework library file does not exist... Force to NOTFOUND:
+        set(QT_${_upper_qt_module}_LIBRARY_DEBUG "QT_${_upper_qt_module}_LIBRARY_DEBUG-NOTFOUND" CACHE FILEPATH "Path to a library." FORCE)
+      endif()
+    endif()
   endforeach()
 
   # QtUiTools is sometimes not in the same directory as the other found libraries

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

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


hooks/post-receive
-- 
CMake