[Cmake-commits] CMake branch, master, updated. v3.3.1-888-gc450686

[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  c450686ef20597d43d4f019b315275cc8a6ba4a2 (commit)
       via  3c37d2642d9000a2d01bc46ad0ea74a741bdb658 (commit)
      from  870d839f0d050e1db117c945d478938db657072e (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=c450686ef20597d43d4f019b315275cc8a6ba4a2
commit c450686ef20597d43d4f019b315275cc8a6ba4a2
Merge: 870d839 3c37d26
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Aug 21 09:29:02 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Aug 21 09:29:02 2015 -0400

    Merge topic 'OUTPUT_NAME-genex-no-recursion'
    
    3c37d264 cmGeneratorTarget: Avoid recursion in GetOutputName method


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

Summary of changes:
 Source/cmGeneratorTarget.cxx                       |   93 ++++++++++++--------
 Source/cmGeneratorTarget.h                         |    4 +
 .../OUTPUT_NAME-recursion-result.txt}              |    0
 .../OUTPUT_NAME-recursion-stderr.txt               |    4 +
 .../OUTPUT_NAME-recursion.cmake                    |    3 +
 .../GeneratorExpression/RunCMakeTest.cmake         |    1 +
 .../TARGET_FILE-recursion.cmake                    |    1 +
 7 files changed, 71 insertions(+), 35 deletions(-)
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => GeneratorExpression/OUTPUT_NAME-recursion-result.txt} (100%)
 create mode 100644 Tests/RunCMake/GeneratorExpression/OUTPUT_NAME-recursion-stderr.txt
 create mode 100644 Tests/RunCMake/GeneratorExpression/OUTPUT_NAME-recursion.cmake


hooks/post-receive
-- 
CMake