[Cmake-commits] CMake branch, next, updated. v2.8.10.2-1468-gf7837b8

[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  f7837b8ac4e14fa60bb2ef614c01c66620fe50ac (commit)
       via  434be2fb335b101c48d600ce8786e573b6cb2218 (commit)
      from  1a489e5c088e31b33b506b4c941b0f45f91ef161 (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=f7837b8ac4e14fa60bb2ef614c01c66620fe50ac
commit f7837b8ac4e14fa60bb2ef614c01c66620fe50ac
Merge: 1a489e5 434be2f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Jan 8 07:44:31 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 8 07:44:31 2013 -0500

    Merge topic 'qt4-target-depends' into next
    
    434be2f Put the calculated include dir into the INTERFACE.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=434be2fb335b101c48d600ce8786e573b6cb2218
commit 434be2fb335b101c48d600ce8786e573b6cb2218
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Jan 8 13:43:13 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Jan 8 13:43:13 2013 +0100

    Put the calculated include dir into the INTERFACE.
    
    On mac, the include dirs don't follow the same pattern as elsewhere.

diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
index 73431f8..9651023 100644
--- a/Modules/FindQt4.cmake
+++ b/Modules/FindQt4.cmake
@@ -420,7 +420,7 @@ macro (_QT4_ADJUST_LIB_VARS _camelCaseBasename)
       endif ()
       set_property(TARGET Qt4::${_camelCaseBasename} PROPERTY
         INTERFACE_INCLUDE_DIRECTORIES
-          "${QT_HEADERS_DIR}/${_camelCaseBasename}"
+          "${QT_${basename}_INCLUDE_DIR}"
       )
       string(REGEX REPLACE "^QT" "" _stemname ${basename})
       set_property(TARGET Qt4::${_camelCaseBasename} PROPERTY

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

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


hooks/post-receive
-- 
CMake