[Cmake-commits] CMake branch, master, updated. v2.8.9-448-g103d993
Brad King
brad.king at kitware.com
Fri Sep 28 17:15:05 EDT 2012
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 103d99338a11b7e35c9a1a9382e56aa3d43c468d (commit)
via 083de7ed35b26dceff6edeb4fc8f9d2500855a9b (commit)
via 08cb4fa4c0378468fc2757666701617f6fe8270e (commit)
via 0ef091d98677253c340d4045413057c50566a528 (commit)
via eb250cd18aaa5308eee12cf016bbfdd25a543da6 (commit)
via 7e807472d2b17d40c702ff91c7255eca04a64ebe (commit)
via 239ac841538be536e70cbddb2b04bef2b342a2e5 (commit)
via e028381bf1c5d1fdf464ed835a549be4a0569adb (commit)
via b8e61d687abfacf1d5ed3b10cfe20315a344620c (commit)
via 2c2b25b203e653326c0f4064649da06a8cdfd7a5 (commit)
via b7e48e0acbd0cd30f803ec8c2d402c636beba778 (commit)
via 9a160871d0bc4233a71dfbf2ffcc888a940bb921 (commit)
via 4557c8db4813b4198fb7d64249e104bdcb828ae5 (commit)
via c6abc41eb5ece8fe10d08faf7792337a760d4251 (commit)
via 0ff4e3f0b88885eafab0693fdf03b44c7a5f9d0c (commit)
via f178d531a6a75b3cbdaa0a3dec5e0aa8daca7d24 (commit)
from 908f46a161683ed2cb0de61eb54f74ae665511ef (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=103d99338a11b7e35c9a1a9382e56aa3d43c468d
commit 103d99338a11b7e35c9a1a9382e56aa3d43c468d
Merge: 908f46a 083de7e
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Sep 28 17:15:03 2012 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Sep 28 17:15:03 2012 -0400
Merge topic 'generator-expression-target-properties'
083de7e Process generator expressions in the COMPILE_DEFINITIONS target property.
08cb4fa Process generator expressions in the INCLUDE_DIRECTORIES property.
0ef091d Early return if there is no target.
eb250cd Add a self-reference check for target properties.
7e80747 Add API to check that dependent target properties form a DAG.
239ac84 Add a generator expression for target properties.
e028381 Extend the generator expression language with more logic.
b8e61d6 Refactor GetCompileDefinitions a bit.
2c2b25b Return a std::string from GetCompileDefinitions.
b7e48e0 Add an AppendDefines std::string overload.
9a16087 Convert paths in INCLUDE_DIRECTORIES property to Unix slashes.
4557c8d Don't prepend a path before generator expressions in include_directories.
c6abc41 Add include guard for cmGeneratorExpression.
0ff4e3f Port remaining code to GetCompileDefinitions().
f178d53 Fix indentation in the code blocks generator.
-----------------------------------------------------------------------
Summary of changes:
Source/CMakeLists.txt | 2 +
Source/cmAddTestCommand.h | 2 +-
Source/cmDocumentGeneratorExpressions.h | 17 ++-
Source/cmExtraCodeBlocksGenerator.cxx | 93 ++++++------
Source/cmGeneratorExpression.cxx | 8 +-
Source/cmGeneratorExpression.h | 12 ++-
Source/cmGeneratorExpressionDAGChecker.cxx | 106 ++++++++++++
Source/cmGeneratorExpressionDAGChecker.h | 44 +++++
Source/cmGeneratorExpressionEvaluator.cxx | 169 ++++++++++++++++++--
Source/cmGeneratorExpressionEvaluator.h | 19 ++-
Source/cmGeneratorTarget.cxx | 60 ++++++--
Source/cmGeneratorTarget.h | 2 +-
Source/cmGlobalXCodeGenerator.cxx | 17 +--
Source/cmIncludeDirectoryCommand.cxx | 16 ++-
Source/cmLocalGenerator.cxx | 11 +-
Source/cmLocalGenerator.h | 5 +
Source/cmLocalVisualStudio7Generator.cxx | 15 +--
Source/cmVisualStudio10TargetGenerator.cxx | 13 +-
Tests/CompileDefinitions/compiletest.cpp | 9 +
.../CompileDefinitions/target_prop/CMakeLists.txt | 6 +
Tests/GeneratorExpression/CMakeLists.txt | 17 ++
Tests/GeneratorExpression/check.cmake | 17 ++
.../TargetIncludeDirectories/CMakeLists.txt | 8 +
.../TargetIncludeDirectories/main.cpp | 4 +
.../TargetIncludeDirectories/sing/ting/ting.h | 1 +
Tests/RunCMake/CMakeLists.txt | 1 +
.../BadSelfReference1-result.txt} | 0
.../BadSelfReference1-stderr.txt | 6 +
.../BadSelfReference1.cmake | 7 +
.../BadSelfReference2-result.txt} | 0
.../BadSelfReference2-stderr.txt | 6 +
.../BadSelfReference2.cmake | 9 +
.../BadSelfReference3-result.txt} | 0
.../BadSelfReference3-stderr.txt | 6 +
.../BadSelfReference3.cmake | 8 +
.../BadSelfReference4-result.txt} | 0
.../BadSelfReference4-stderr.txt | 6 +
.../BadSelfReference4.cmake | 10 ++
.../BadSelfReference5-result.txt} | 0
.../BadSelfReference5-stderr.txt | 6 +
.../BadSelfReference5.cmake | 10 ++
.../BadSelfReference6-result.txt} | 0
.../BadSelfReference6-stderr.txt | 6 +
.../BadSelfReference6.cmake | 10 ++
.../CMakeLists.txt | 8 +
.../RunCMakeTest.cmake | 8 +
bootstrap | 1 +
47 files changed, 660 insertions(+), 121 deletions(-)
create mode 100644 Source/cmGeneratorExpressionDAGChecker.cxx
create mode 100644 Source/cmGeneratorExpressionDAGChecker.h
create mode 100644 Tests/IncludeDirectories/TargetIncludeDirectories/sing/ting/ting.h
copy Tests/RunCMake/{GeneratorExpression/BadAND-result.txt => TargetPropertyGeneratorExpressions/BadSelfReference1-result.txt} (100%)
create mode 100644 Tests/RunCMake/TargetPropertyGeneratorExpressions/BadSelfReference1-stderr.txt
create mode 100644 Tests/RunCMake/TargetPropertyGeneratorExpressions/BadSelfReference1.cmake
copy Tests/RunCMake/{GeneratorExpression/BadAND-result.txt => TargetPropertyGeneratorExpressions/BadSelfReference2-result.txt} (100%)
create mode 100644 Tests/RunCMake/TargetPropertyGeneratorExpressions/BadSelfReference2-stderr.txt
create mode 100644 Tests/RunCMake/TargetPropertyGeneratorExpressions/BadSelfReference2.cmake
copy Tests/RunCMake/{GeneratorExpression/BadAND-result.txt => TargetPropertyGeneratorExpressions/BadSelfReference3-result.txt} (100%)
create mode 100644 Tests/RunCMake/TargetPropertyGeneratorExpressions/BadSelfReference3-stderr.txt
create mode 100644 Tests/RunCMake/TargetPropertyGeneratorExpressions/BadSelfReference3.cmake
copy Tests/RunCMake/{GeneratorExpression/BadAND-result.txt => TargetPropertyGeneratorExpressions/BadSelfReference4-result.txt} (100%)
create mode 100644 Tests/RunCMake/TargetPropertyGeneratorExpressions/BadSelfReference4-stderr.txt
create mode 100644 Tests/RunCMake/TargetPropertyGeneratorExpressions/BadSelfReference4.cmake
copy Tests/RunCMake/{GeneratorExpression/BadAND-result.txt => TargetPropertyGeneratorExpressions/BadSelfReference5-result.txt} (100%)
create mode 100644 Tests/RunCMake/TargetPropertyGeneratorExpressions/BadSelfReference5-stderr.txt
create mode 100644 Tests/RunCMake/TargetPropertyGeneratorExpressions/BadSelfReference5.cmake
copy Tests/RunCMake/{GeneratorExpression/BadAND-result.txt => TargetPropertyGeneratorExpressions/BadSelfReference6-result.txt} (100%)
create mode 100644 Tests/RunCMake/TargetPropertyGeneratorExpressions/BadSelfReference6-stderr.txt
create mode 100644 Tests/RunCMake/TargetPropertyGeneratorExpressions/BadSelfReference6.cmake
create mode 100644 Tests/RunCMake/TargetPropertyGeneratorExpressions/CMakeLists.txt
create mode 100644 Tests/RunCMake/TargetPropertyGeneratorExpressions/RunCMakeTest.cmake
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list