[Cmake-commits] CMake branch, master, updated. v2.8.11-200-gbe85fa4
Brad King
brad.king at kitware.com
Tue May 28 10:42:20 EDT 2013
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 be85fa4a8916819514ca5c5c01db14733d5b9bce (commit)
via b983a58bdf1a03a49f2512ac68390888669ac30b (commit)
from 9c1393217c34f3fae101d5852df67a71edebb605 (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=be85fa4a8916819514ca5c5c01db14733d5b9bce
commit be85fa4a8916819514ca5c5c01db14733d5b9bce
Merge: 9c13932 b983a58
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue May 28 10:42:18 2013 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue May 28 10:42:18 2013 -0400
Merge topic 'genex-generate-file'
b983a58 file: Add GENERATE command to produce files at generate time
-----------------------------------------------------------------------
Summary of changes:
Source/cmBootstrapCommands.cxx | 1 +
Source/cmFileCommand.cxx | 78 ++++++++++
Source/cmFileCommand.h | 19 +++
Source/cmGeneratorExpressionEvaluationFile.cxx | 151 ++++++++++++++++++++
Source/cmGeneratorExpressionEvaluationFile.h | 48 ++++++
Source/cmGlobalGenerator.cxx | 51 +++++++
Source/cmGlobalGenerator.h | 11 ++
Tests/RunCMake/CMakeLists.txt | 2 +
.../BadCondition-result.txt} | 0
.../RunCMake/File_Generate/BadCondition-stderr.txt | 3 +
Tests/RunCMake/File_Generate/BadCondition.cmake | 5 +
.../{CMP0004 => File_Generate}/CMakeLists.txt | 0
.../CommandConflict-result.txt} | 0
.../File_Generate/CommandConflict-stderr.txt | 1 +
Tests/RunCMake/File_Generate/CommandConflict.cmake | 9 ++
Tests/RunCMake/File_Generate/DebugEvaluate.cmake | 5 +
.../EmptyCondition1-result.txt} | 0
.../File_Generate/EmptyCondition1-stderr.txt | 4 +
Tests/RunCMake/File_Generate/EmptyCondition1.cmake | 5 +
.../EmptyCondition2-result.txt} | 0
.../File_Generate/EmptyCondition2-stderr.txt | 4 +
Tests/RunCMake/File_Generate/EmptyCondition2.cmake | 5 +
.../OutputConflict-result.txt} | 0
.../File_Generate/OutputConflict-stderr.txt | 5 +
Tests/RunCMake/File_Generate/OutputConflict.cmake | 4 +
Tests/RunCMake/File_Generate/RunCMakeTest.cmake | 10 ++
Tests/RunCMake/File_Generate/input.txt | 1 +
27 files changed, 422 insertions(+), 0 deletions(-)
create mode 100644 Source/cmGeneratorExpressionEvaluationFile.cxx
create mode 100644 Source/cmGeneratorExpressionEvaluationFile.h
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => File_Generate/BadCondition-result.txt} (100%)
create mode 100644 Tests/RunCMake/File_Generate/BadCondition-stderr.txt
create mode 100644 Tests/RunCMake/File_Generate/BadCondition.cmake
copy Tests/RunCMake/{CMP0004 => File_Generate}/CMakeLists.txt (100%)
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => File_Generate/CommandConflict-result.txt} (100%)
create mode 100644 Tests/RunCMake/File_Generate/CommandConflict-stderr.txt
create mode 100644 Tests/RunCMake/File_Generate/CommandConflict.cmake
create mode 100644 Tests/RunCMake/File_Generate/DebugEvaluate.cmake
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => File_Generate/EmptyCondition1-result.txt} (100%)
create mode 100644 Tests/RunCMake/File_Generate/EmptyCondition1-stderr.txt
create mode 100644 Tests/RunCMake/File_Generate/EmptyCondition1.cmake
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => File_Generate/EmptyCondition2-result.txt} (100%)
create mode 100644 Tests/RunCMake/File_Generate/EmptyCondition2-stderr.txt
create mode 100644 Tests/RunCMake/File_Generate/EmptyCondition2.cmake
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => File_Generate/OutputConflict-result.txt} (100%)
create mode 100644 Tests/RunCMake/File_Generate/OutputConflict-stderr.txt
create mode 100644 Tests/RunCMake/File_Generate/OutputConflict.cmake
create mode 100644 Tests/RunCMake/File_Generate/RunCMakeTest.cmake
create mode 100644 Tests/RunCMake/File_Generate/input.txt
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list