[Cmake-commits] CMake branch, next, updated. v2.8.2-514-gf11b4dc

[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  f11b4dcbf196ecc6e8cc4329344b1fbf672dbfc4 (commit)
       via  2756311a9aa9b17bc451a1293d2cfb7e6e8e719b (commit)
      from  04ba78bcaa3c1fb8479b3b651320d5f0b432f332 (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=f11b4dcbf196ecc6e8cc4329344b1fbf672dbfc4
commit f11b4dcbf196ecc6e8cc4329344b1fbf672dbfc4
Merge: 04ba78b 2756311
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Tue Aug 24 12:41:59 2010 -0600
Commit:     Clinton Stimpson <clinton at elemtech.com>
CommitDate: Tue Aug 24 12:41:59 2010 -0600

    Merge branch 'moc_param_bug11120' into next


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2756311a9aa9b17bc451a1293d2cfb7e6e8e719b
commit 2756311a9aa9b17bc451a1293d2cfb7e6e8e719b
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Tue Aug 24 12:41:14 2010 -0600
Commit:     Clinton Stimpson <clinton at elemtech.com>
CommitDate: Tue Aug 24 12:41:14 2010 -0600

    Make sure moc parameters file goes in binary directory.
    
    Fix bug 11120.  Parameters files previously went into source
    directory when qt4_generate_moc() was given relative paths.
    Also simplified some logic for absolute paths.

diff --git a/Modules/Qt4Macros.cmake b/Modules/Qt4Macros.cmake
index 10cf1d1..700d3a2 100644
--- a/Modules/Qt4Macros.cmake
+++ b/Modules/Qt4Macros.cmake
@@ -129,7 +129,11 @@ MACRO (QT4_GENERATE_MOC infile outfile )
 # get include dirs and flags
    QT4_GET_MOC_FLAGS(moc_flags)
    GET_FILENAME_COMPONENT(abs_infile ${infile} ABSOLUTE)
-   QT4_CREATE_MOC_COMMAND(${abs_infile} ${outfile} "${moc_flags}" "")
+   SET(_outfile "${outfile}")
+   IF(NOT IS_ABSOLUTE "${outfile}")
+     SET(_outfile "${CMAKE_CURRENT_BINARY_DIR}/${outfile}")
+   ENDIF(NOT IS_ABSOLUTE "${outfile}")
+   QT4_CREATE_MOC_COMMAND(${abs_infile} ${_outfile} "${moc_flags}" "")
    SET_SOURCE_FILES_PROPERTIES(${outfile} PROPERTIES SKIP_AUTOMOC TRUE)  # dont run automoc on this file
 ENDMACRO (QT4_GENERATE_MOC)
 
@@ -187,10 +191,9 @@ MACRO (QT4_ADD_RESOURCES outfiles )
     SET(_RC_DEPENDS)
     FOREACH(_RC_FILE ${_RC_FILES})
       STRING(REGEX REPLACE "^<file[^>]*>" "" _RC_FILE "${_RC_FILE}")
-      STRING(REGEX MATCH "^/|([A-Za-z]:/)" _ABS_PATH_INDICATOR "${_RC_FILE}")
-      IF(NOT _ABS_PATH_INDICATOR)
+      IF(NOT IS_ABSOLUTE "${_RC_FILE}")
         SET(_RC_FILE "${rc_path}/${_RC_FILE}")
-      ENDIF(NOT _ABS_PATH_INDICATOR)
+      ENDIF(NOT IS_ABSOLUTE "${_RC_FILE}")
       SET(_RC_DEPENDS ${_RC_DEPENDS} "${_RC_FILE}")
     ENDFOREACH(_RC_FILE)
     ADD_CUSTOM_COMMAND(OUTPUT ${outfile}

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

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


hooks/post-receive
-- 
CMake