[Cmake-commits] CMake branch, next, updated. v2.8.7-2529-g267cc72

[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  267cc72af16065a85f935d6e046d6cf8a604fc28 (commit)
       via  7a6d2796e63a8a390bd86fe9a029c4add119132b (commit)
      from  e36cce123f4e5449fe6f8bfa22d5f3881d94e533 (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=267cc72af16065a85f935d6e046d6cf8a604fc28
commit 267cc72af16065a85f935d6e046d6cf8a604fc28
Merge: e36cce1 7a6d279
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Wed Feb 8 21:02:12 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 8 21:02:12 2012 -0500

    Merge topic 'qt4-translation-includes' into next
    
    7a6d279 FindQt4: Add include directories for lupdate.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7a6d2796e63a8a390bd86fe9a029c4add119132b
commit 7a6d2796e63a8a390bd86fe9a029c4add119132b
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Wed Feb 8 19:01:29 2012 -0700
Commit:     Clinton Stimpson <clinton at elemtech.com>
CommitDate: Wed Feb 8 19:01:29 2012 -0700

    FindQt4: Add include directories for lupdate.
    
    Fixes bug #12644.
    Thanks Bernd Lörwald for partial patch.

diff --git a/Modules/Qt4Macros.cmake b/Modules/Qt4Macros.cmake
index 4da1a3f..f327125 100644
--- a/Modules/Qt4Macros.cmake
+++ b/Modules/Qt4Macros.cmake
@@ -393,7 +393,13 @@ MACRO(QT4_CREATE_TRANSLATION _qm_files)
        FOREACH(_pro_src ${_my_sources})
          SET(_pro_srcs "${_pro_srcs} \"${_pro_src}\"")
        ENDFOREACH(_pro_src ${_my_sources})
-       FILE(WRITE ${_ts_pro} "SOURCES = ${_pro_srcs}")
+       SET(_pro_includes)
+       GET_DIRECTORY_PROPERTY(_inc_DIRS INCLUDE_DIRECTORIES)
+       FOREACH(_pro_include ${_inc_DIRS})
+         GET_FILENAME_COMPONENT(_abs_include "${_pro_include}" ABSOLUTE)
+         SET(_pro_includes "${_pro_includes} \"${_abs_include}\"")
+       ENDFOREACH(_pro_include ${CMAKE_CXX_INCLUDE_PATH})
+       FILE(WRITE ${_ts_pro} "SOURCES = ${_pro_srcs}\nINCLUDEPATH = ${_pro_includes}\n")
      ENDIF(_my_sources)
      ADD_CUSTOM_COMMAND(OUTPUT ${_ts_file}
         COMMAND ${QT_LUPDATE_EXECUTABLE}

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

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


hooks/post-receive
-- 
CMake