[Cmake-commits] CMake branch, master, updated. v3.3.0-836-ga07d160

[Brad King]

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  a07d16085b14e7257254d824b3e800406bc63873 (commit)
       via  d25819bc2623b5144ffc57b694500993ac5759b4 (commit)
       via  e36a05fd7f7d008c4c1e75ebf46eac3072ef71b1 (commit)
      from  0576aa6085823744c1cd594649e071688b207d5a (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=a07d16085b14e7257254d824b3e800406bc63873
commit a07d16085b14e7257254d824b3e800406bc63873
Merge: 0576aa6 d25819b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Aug 13 10:38:54 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Aug 13 10:38:54 2015 -0400

    Merge topic 'OUTPUT_DIRECTORY-genex'
    
    d25819bc Add generator expression support to OUTPUT_DIRECTORY target properties
    e36a05fd cmTarget: Detect and diagnose recursion in GetOutputInfo


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

Summary of changes:
 Help/prop_tgt/ARCHIVE_OUTPUT_DIRECTORY_CONFIG.rst  |    3 ++
 Help/prop_tgt/LIBRARY_OUTPUT_DIRECTORY_CONFIG.rst  |    3 ++
 Help/prop_tgt/RUNTIME_OUTPUT_DIRECTORY_CONFIG.rst  |    3 ++
 Help/prop_tgt/XXX_OUTPUT_DIRECTORY.txt             |    7 +++-
 Help/release/dev/OUTPUT_DIRECTORY-genex.rst        |    7 ++++
 Source/cmTarget.cxx                                |   41 +++++++++++++++++---
 Tests/ExportImport/Export/CMakeLists.txt           |   17 +++++++-
 .../ExportImport/Export/{testExe3.c => testExe4.c} |    2 +-
 Tests/ExportImport/Import/A/CMakeLists.txt         |   12 ++++++
 Tests/ExportImport/Import/A/imp_testExe1.c         |    3 +-
 .../GeneratorExpression/RunCMakeTest.cmake         |    1 +
 .../TARGET_FILE-recursion-result.txt}              |    0
 .../TARGET_FILE-recursion-stderr.txt               |    4 ++
 .../TARGET_FILE-recursion.cmake                    |    3 ++
 14 files changed, 95 insertions(+), 11 deletions(-)
 create mode 100644 Help/release/dev/OUTPUT_DIRECTORY-genex.rst
 copy Tests/ExportImport/Export/{testExe3.c => testExe4.c} (84%)
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => GeneratorExpression/TARGET_FILE-recursion-result.txt} (100%)
 create mode 100644 Tests/RunCMake/GeneratorExpression/TARGET_FILE-recursion-stderr.txt
 create mode 100644 Tests/RunCMake/GeneratorExpression/TARGET_FILE-recursion.cmake


hooks/post-receive
-- 
CMake