[Cmake-commits] CMake branch, next, updated. v2.8.5-1285-ga4368f4

[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  a4368f4cff8639953311854fae7329decaf89d8d (commit)
       via  702538eaa3315f3fcad9f1daea01e6a83928967b (commit)
      from  5ed5d1db23b30716f49e5e466e20dcaca70c4a4e (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=a4368f4cff8639953311854fae7329decaf89d8d
commit a4368f4cff8639953311854fae7329decaf89d8d
Merge: 5ed5d1d 702538e
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Mon Jul 25 14:31:37 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jul 25 14:31:37 2011 -0400

    Merge topic 'qt4-apple-framework-fix' into next
    
    702538e Qt4: Fix reference of undefined variable when detecting frameworks on Mac OS X


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=702538eaa3315f3fcad9f1daea01e6a83928967b
commit 702538eaa3315f3fcad9f1daea01e6a83928967b
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Mon Jul 25 12:30:30 2011 -0600
Commit:     Clinton Stimpson <clinton at elemtech.com>
CommitDate: Mon Jul 25 12:30:30 2011 -0600

    Qt4: Fix reference of undefined variable when detecting frameworks on Mac OS X

diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
index 86fce9d..406807b 100644
--- a/Modules/FindQt4.cmake
+++ b/Modules/FindQt4.cmake
@@ -578,19 +578,6 @@ IF (QT_QMAKE_EXECUTABLE AND QTVERSION)
 
   ENDIF ()
 
-  IF (APPLE)
-    SET(CMAKE_FIND_FRAMEWORK_OLD ${CMAKE_FIND_FRAMEWORK})
-    IF (EXISTS ${QT_LIBRARY_DIR}/QtCore.framework)
-      SET(QT_USE_FRAMEWORKS ON CACHE INTERNAL "" FORCE)
-      SET(CMAKE_FIND_FRAMEWORK FIRST)
-    ELSE (EXISTS ${QT_LIBRARY_DIR}/QtCore.framework)
-      SET(QT_USE_FRAMEWORKS OFF CACHE INTERNAL "" FORCE)
-      SET(CMAKE_FIND_FRAMEWORK LAST)
-    ENDIF (EXISTS ${QT_LIBRARY_DIR}/QtCore.framework)
-  ENDIF (APPLE)
-
-  _QT4_ADJUST_LIB_VARS(QtCore)
-
   # set QT_LIBRARY_DIR based on location of QtCore found.
   IF(QT_QTCORE_LIBRARY_RELEASE)
     GET_FILENAME_COMPONENT(QT_LIBRARY_DIR_TMP "${QT_QTCORE_LIBRARY_RELEASE}" PATH)
@@ -614,6 +601,17 @@ IF (QT_QMAKE_EXECUTABLE AND QTVERSION)
     SET(QT_BINARY_DIR ${qt_bins} CACHE INTERNAL "" FORCE)
   ENDIF (NOT QT_BINARY_DIR  OR  QT_QMAKE_CHANGED)
 
+  IF (APPLE)
+    SET(CMAKE_FIND_FRAMEWORK_OLD ${CMAKE_FIND_FRAMEWORK})
+    IF (EXISTS ${QT_LIBRARY_DIR}/QtCore.framework)
+      SET(QT_USE_FRAMEWORKS ON CACHE INTERNAL "" FORCE)
+      SET(CMAKE_FIND_FRAMEWORK FIRST)
+    ELSE (EXISTS ${QT_LIBRARY_DIR}/QtCore.framework)
+      SET(QT_USE_FRAMEWORKS OFF CACHE INTERNAL "" FORCE)
+      SET(CMAKE_FIND_FRAMEWORK LAST)
+    ENDIF (EXISTS ${QT_LIBRARY_DIR}/QtCore.framework)
+  ENDIF (APPLE)
+
   # ask qmake for the include dir
   IF (QT_LIBRARY_DIR AND (NOT QT_QTCORE_INCLUDE_DIR OR NOT QT_HEADERS_DIR OR  QT_QMAKE_CHANGED))
       _qt4_query_qmake(QT_INSTALL_HEADERS qt_headers)
@@ -904,6 +902,8 @@ IF (QT_QMAKE_EXECUTABLE AND QTVERSION)
 
   # Set QT_xyz_LIBRARY variable and add 
   # library include path to QT_INCLUDES
+  _QT4_ADJUST_LIB_VARS(QtCore)
+
   FOREACH(QT_MODULE ${QT_MODULES})
     _QT4_ADJUST_LIB_VARS(${QT_MODULE})
   ENDFOREACH(QT_MODULE)

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

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


hooks/post-receive
-- 
CMake