[Cmake-commits] CMake branch, master, updated. v3.1.0-rc1-275-gcddb500

Brad King brad.king at kitware.com
Thu Nov 13 10:08:33 EST 2014


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  cddb5002b5c28c0cc5fe9c1e41a5e0f556b3e3a8 (commit)
       via  b80557c7bdf12f9e924ac8b010d547ce4561848e (commit)
       via  0019d54b6e4bfde7ef1c211a1c5e5bab194381b2 (commit)
      from  f4e652b5633c14d3602be8805a2f0c49bb524147 (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=cddb5002b5c28c0cc5fe9c1e41a5e0f556b3e3a8
commit cddb5002b5c28c0cc5fe9c1e41a5e0f556b3e3a8
Merge: f4e652b b80557c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Nov 13 10:08:32 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Nov 13 10:08:32 2014 -0500

    Merge topic 'file-GENERATE-source'
    
    b80557c7 file(GENERATE): Evaluate early to allow generating source files
    0019d54b Genex: Fix whitespace issue.


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

Summary of changes:
 Source/cmGeneratorExpression.cxx                   |    2 ++
 Source/cmGeneratorExpression.h                     |    5 ++++
 Source/cmGeneratorExpressionEvaluationFile.cxx     |   17 +++++++++++
 Source/cmGeneratorExpressionEvaluationFile.h       |    2 ++
 Source/cmGeneratorExpressionEvaluator.cxx          |    6 +++-
 Source/cmGeneratorExpressionEvaluator.h            |    1 +
 Source/cmGeneratorTarget.cxx                       |   11 +++++++
 Source/cmGlobalGenerator.cxx                       |   30 ++++++++++++++++++--
 Source/cmGlobalGenerator.h                         |   10 +++++++
 Source/cmLocalGenerator.cxx                        |   11 +++++++
 .../GenerateSource-result.txt}                     |    0
 .../GenerateSource-stderr.txt}                     |    0
 Tests/RunCMake/File_Generate/GenerateSource.cmake  |   12 ++++++++
 .../OutputNameMatchesObjects-result.txt}           |    0
 .../OutputNameMatchesObjects-stderr.txt            |    9 ++++++
 .../File_Generate/OutputNameMatchesObjects.cmake   |   10 +++++++
 .../OutputNameMatchesOtherSources-result.txt}      |    0
 .../OutputNameMatchesOtherSources-stderr.txt}      |    0
 .../OutputNameMatchesOtherSources.cmake            |   14 +++++++++
 .../OutputNameMatchesSources-result.txt}           |    0
 .../OutputNameMatchesSources-stderr.txt            |    7 +++++
 .../File_Generate/OutputNameMatchesSources.cmake   |   12 ++++++++
 Tests/RunCMake/File_Generate/RunCMakeTest.cmake    |    8 ++++++
 .../RunCMake/{CMP0022 => File_Generate}/empty.cpp  |    0
 24 files changed, 164 insertions(+), 3 deletions(-)
 copy Tests/RunCMake/{CMP0022/CMP0022-WARN-empty-old-result.txt => File_Generate/GenerateSource-result.txt} (100%)
 copy Tests/RunCMake/{CMP0022/CMP0022-NOWARN-exe-stderr.txt => File_Generate/GenerateSource-stderr.txt} (100%)
 create mode 100644 Tests/RunCMake/File_Generate/GenerateSource.cmake
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => File_Generate/OutputNameMatchesObjects-result.txt} (100%)
 create mode 100644 Tests/RunCMake/File_Generate/OutputNameMatchesObjects-stderr.txt
 create mode 100644 Tests/RunCMake/File_Generate/OutputNameMatchesObjects.cmake
 copy Tests/RunCMake/{CMP0022/CMP0022-WARN-empty-old-result.txt => File_Generate/OutputNameMatchesOtherSources-result.txt} (100%)
 copy Tests/RunCMake/{CMP0022/CMP0022-NOWARN-exe-stderr.txt => File_Generate/OutputNameMatchesOtherSources-stderr.txt} (100%)
 create mode 100644 Tests/RunCMake/File_Generate/OutputNameMatchesOtherSources.cmake
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => File_Generate/OutputNameMatchesSources-result.txt} (100%)
 create mode 100644 Tests/RunCMake/File_Generate/OutputNameMatchesSources-stderr.txt
 create mode 100644 Tests/RunCMake/File_Generate/OutputNameMatchesSources.cmake
 copy Tests/RunCMake/{CMP0022 => File_Generate}/empty.cpp (100%)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list