[Cmake-commits] CMake branch, next, updated. v2.8.10.2-1512-g50e4e0f

[Stephen Kelly]

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  50e4e0f12c22dc88dba550ba96a46c1ca1d634f0 (commit)
       via  fa18e4c7314a5024d13921f0ade455cc78b546c2 (commit)
      from  e49d857e7086bbd3b3d600cd02d5c00d3a02f231 (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=50e4e0f12c22dc88dba550ba96a46c1ca1d634f0
commit 50e4e0f12c22dc88dba550ba96a46c1ca1d634f0
Merge: e49d857 fa18e4c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Jan 9 02:25:52 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 9 02:25:52 2013 -0500

    Merge topic 'qt4-target-depends' into next
    
    fa18e4c Use the QT_INCLUDE_DIR instead of QT_HEADERS_DIR


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fa18e4c7314a5024d13921f0ade455cc78b546c2
commit fa18e4c7314a5024d13921f0ade455cc78b546c2
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Jan 9 08:24:02 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Jan 9 08:24:02 2013 +0100

    Use the QT_INCLUDE_DIR instead of QT_HEADERS_DIR
    
    Perhaps this will fix Qt4Targets test on Mac.

diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
index 9651023..a9e9d82 100644
--- a/Modules/FindQt4.cmake
+++ b/Modules/FindQt4.cmake
@@ -988,7 +988,7 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION)
   set_property(TARGET Qt4::QtCore APPEND PROPERTY
     INTERFACE_INCLUDE_DIRECTORIES
       "${QT_MKSPECS_DIR}/default"
-      "${QT_HEADERS_DIR}"
+      ${QT_INCLUDE_DIR}
   )
 
   foreach(QT_MODULE ${QT_MODULES})

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

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


hooks/post-receive
-- 
CMake