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 53c2dada1c4019ed21f14f33618a975a9652c84e (commit)
via 7aa99270fa77a13e8e710adc0098385403d6cf7a (commit)
via 78e54b99fed1bd4c899360c9df779205ce6b29ba (commit)
via d729e8b74ccdf14d809a1b7f9260a5a1d225c2bc (commit)
via 354face4fa234adfe6f056dc9d3039fc135ab4ef (commit)
via 8b3b88abd82a36daf541dfa7094f978e0be08efc (commit)
via b3d8f5dab7f33dba4f327ab7ef4bd7ea90d6b651 (commit)
via a4985a9af9ed9762c1a51c369981609dd24f7425 (commit)
via d70650d6c3c94d1d903eb7f21998861d8f7bf2c6 (commit)
via 4801eb633392eff95586709df570dabcdf0f5db1 (commit)
from fb4de4495dbdde59b5fb210f0cbb835ebf5d7a6a (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=53c2dada1c4019ed21f14f33618a975a9652c84e
commit 53c2dada1c4019ed21f14f33618a975a9652c84e
Merge: fb4de44 7aa9927
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Oct 9 08:40:07 2012 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Oct 9 08:40:07 2012 -0400
Merge topic 'generator-expression-bug-fixes'
7aa9927 GenEx: Don't use std::vector::at(int).
78e54b9 GenEx: Add tests for "0" and "1" expressions with literal commas.
d729e8b GenEx: Add test for $<BOOL:> with empty parameter.
354face GenEx: Ensure that the empty CONFIGURATION can be used
conditionally.
8b3b88a GenEx: Validate target and property names.
b3d8f5d GenEx: Parse comma after colon tokens specially
a4985a9 GenEx: Report actual target name not found, not "0" each time.
d70650d GenEx: Return after error reported.
4801eb6 GenEx: It is not an error to specify an empty parameter
-----------------------------------------------------------------------
Summary of changes:
Source/cmGeneratorExpressionEvaluator.cxx | 65 +++++++++++++++++---
Source/cmGeneratorExpressionParser.cxx | 12 ++--
Tests/GeneratorExpression/CMakeLists.txt | 5 ++
Tests/GeneratorExpression/check.cmake | 5 ++
.../RunCMake/GeneratorExpression/BadNOT-stderr.txt | 2 +-
.../{BadAND-result.txt => BadStrEqual-result.txt} | 0
.../GeneratorExpression/BadStrEqual-stderr.txt | 38 +++++++++++
.../RunCMake/GeneratorExpression/BadStrEqual.cmake | 6 ++
.../GeneratorExpression/RunCMakeTest.cmake | 1 +
.../BadInvalidName1-result.txt} | 0
.../BadInvalidName1-stderr.txt | 6 ++
.../BadInvalidName1.cmake | 7 ++
.../BadInvalidName2-result.txt} | 0
.../BadInvalidName2-stderr.txt | 6 ++
.../BadInvalidName2.cmake | 7 ++
.../BadInvalidName3-result.txt} | 0
.../BadInvalidName3-stderr.txt | 6 ++
.../BadInvalidName3.cmake | 7 ++
.../BadInvalidName4-result.txt} | 0
.../BadInvalidName4-stderr.txt | 6 ++
.../BadInvalidName4.cmake | 9 +++
.../BadInvalidName5-result.txt} | 0
.../BadInvalidName5-stderr.txt | 7 ++
.../BadInvalidName5.cmake | 7 ++
.../BadInvalidName6-result.txt} | 0
.../BadInvalidName6-stderr.txt | 6 ++
.../BadInvalidName6.cmake | 7 ++
.../BadInvalidName7-result.txt} | 0
.../BadInvalidName7-stderr.txt | 6 ++
.../BadInvalidName7.cmake | 9 +++
.../BadInvalidName8-result.txt} | 0
.../BadInvalidName8-stderr.txt | 6 ++
.../BadInvalidName8.cmake | 7 ++
.../BadNonTarget-result.txt} | 0
.../BadNonTarget-stderr.txt | 6 ++
.../BadNonTarget.cmake | 7 ++
.../RunCMakeTest.cmake | 9 +++
37 files changed, 250 insertions(+), 15 deletions(-)
copy Tests/RunCMake/GeneratorExpression/{BadAND-result.txt =>
BadStrEqual-result.txt} (100%)
create mode 100644 Tests/RunCMake/GeneratorExpression/BadStrEqual-stderr.txt
create mode 100644 Tests/RunCMake/GeneratorExpression/BadStrEqual.cmake
copy Tests/RunCMake/{GeneratorExpression/BadAND-result.txt =>
TargetPropertyGeneratorExpressions/BadInvalidName1-result.txt} (100%)
create mode 100644
Tests/RunCMake/TargetPropertyGeneratorExpressions/BadInvalidName1-stderr.txt
create mode 100644
Tests/RunCMake/TargetPropertyGeneratorExpressions/BadInvalidName1.cmake
copy Tests/RunCMake/{GeneratorExpression/BadAND-result.txt =>
TargetPropertyGeneratorExpressions/BadInvalidName2-result.txt} (100%)
create mode 100644
Tests/RunCMake/TargetPropertyGeneratorExpressions/BadInvalidName2-stderr.txt
create mode 100644
Tests/RunCMake/TargetPropertyGeneratorExpressions/BadInvalidName2.cmake
copy Tests/RunCMake/{GeneratorExpression/BadAND-result.txt =>
TargetPropertyGeneratorExpressions/BadInvalidName3-result.txt} (100%)
create mode 100644
Tests/RunCMake/TargetPropertyGeneratorExpressions/BadInvalidName3-stderr.txt
create mode 100644
Tests/RunCMake/TargetPropertyGeneratorExpressions/BadInvalidName3.cmake
copy Tests/RunCMake/{GeneratorExpression/BadAND-result.txt =>
TargetPropertyGeneratorExpressions/BadInvalidName4-result.txt} (100%)
create mode 100644
Tests/RunCMake/TargetPropertyGeneratorExpressions/BadInvalidName4-stderr.txt
create mode 100644
Tests/RunCMake/TargetPropertyGeneratorExpressions/BadInvalidName4.cmake
copy Tests/RunCMake/{GeneratorExpression/BadAND-result.txt =>
TargetPropertyGeneratorExpressions/BadInvalidName5-result.txt} (100%)
create mode 100644
Tests/RunCMake/TargetPropertyGeneratorExpressions/BadInvalidName5-stderr.txt
create mode 100644
Tests/RunCMake/TargetPropertyGeneratorExpressions/BadInvalidName5.cmake
copy Tests/RunCMake/{GeneratorExpression/BadAND-result.txt =>
TargetPropertyGeneratorExpressions/BadInvalidName6-result.txt} (100%)
create mode 100644
Tests/RunCMake/TargetPropertyGeneratorExpressions/BadInvalidName6-stderr.txt
create mode 100644
Tests/RunCMake/TargetPropertyGeneratorExpressions/BadInvalidName6.cmake
copy Tests/RunCMake/{GeneratorExpression/BadAND-result.txt =>
TargetPropertyGeneratorExpressions/BadInvalidName7-result.txt} (100%)
create mode 100644
Tests/RunCMake/TargetPropertyGeneratorExpressions/BadInvalidName7-stderr.txt
create mode 100644
Tests/RunCMake/TargetPropertyGeneratorExpressions/BadInvalidName7.cmake
copy Tests/RunCMake/{GeneratorExpression/BadAND-result.txt =>
TargetPropertyGeneratorExpressions/BadInvalidName8-result.txt} (100%)
create mode 100644
Tests/RunCMake/TargetPropertyGeneratorExpressions/BadInvalidName8-stderr.txt
create mode 100644
Tests/RunCMake/TargetPropertyGeneratorExpressions/BadInvalidName8.cmake
copy Tests/RunCMake/{GeneratorExpression/BadAND-result.txt =>
TargetPropertyGeneratorExpressions/BadNonTarget-result.txt} (100%)
create mode 100644
Tests/RunCMake/TargetPropertyGeneratorExpressions/BadNonTarget-stderr.txt
create mode 100644
Tests/RunCMake/TargetPropertyGeneratorExpressions/BadNonTarget.cmake
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
