[Cmake-commits] CMake branch, master, updated. v2.8.9-312-g865feff

[David Cole]

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, master has been updated
       via  865feff4c114a3fbeeb18c56fd8bb977f3f935f5 (commit)
       via  25a4f5675490d9311db271942ecd1781de5f3558 (commit)
       via  717f31a877e701b801043b893c97f4a186f93739 (commit)
       via  066e85893ffa3492e4247e59a80ee1de67babef5 (commit)
       via  430ba9faef26d66e2fb3ffb938122b62f627562d (commit)
       via  32a572564a94380a543593f9568d34fc2c4a8b70 (commit)
       via  0b6625c605b95ef7e936717e946906d422d3d4f7 (commit)
       via  8ab312b6930c52a8f04688d8834383be4f09f5d5 (commit)
       via  bd728f6feeab10db189e82d3100c9df9ee64ad5c (commit)
      from  3dea63d04d683206cf05dc6d72cb5538222bfbc1 (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=865feff4c114a3fbeeb18c56fd8bb977f3f935f5
commit 865feff4c114a3fbeeb18c56fd8bb977f3f935f5
Merge: 3dea63d 25a4f56
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Tue Sep 18 16:41:31 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Sep 18 16:41:31 2012 -0400

    Merge topic 'qt5-qtdialog-port'
    
    25a4f56 Build with Qt5 if it is found.
    717f31a Compile with both Qt4 and Qt5.
    066e858 Replace two include_directories with a setting.
    430ba9f Use add_subdirectory instead of the obsolete subdirs.
    32a5725 Remove an if which is always true.
    0b6625c Move variable setting down to where it relates to.
    8ab312b Use CMake platform variables instead of Qt ones.
    bd728f6 Add a return-after-error if an old Qt is found.


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

Summary of changes:
 Source/CMakeLists.txt          |    2 +-
 Source/QtDialog/CMakeLists.txt |  210 +++++++++++++++++++++-------------------
 Source/QtDialog/QCMake.cxx     |    4 +
 3 files changed, 117 insertions(+), 99 deletions(-)


hooks/post-receive
-- 
CMake