[Cmake-commits] CMake branch, master, updated. v2.8.10.2-656-g813b519
Brad King
brad.king at kitware.com
Mon Feb 11 13:59:50 EST 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 813b519280af91336c54310b4c975110303b86b5 (commit)
via ba48e63f1e68a22dd46b6c33d283190bf8aa0aed (commit)
via deb51a711369c9e5cce19bc3626e87273c6b5ac4 (commit)
via 9712362b4580fb92394ecf8ff57be186571f4319 (commit)
via faa927e273e04b9aadc13fb1f2b8b307b7383cd2 (commit)
via 510fdcb18801076e2041eaae2941375eecc93ec2 (commit)
via 4de71786e89ba35190e23ae9e1c05f902c5350ff (commit)
via df74bc34d4219a8d6e63ec7e41a9ca4fbe355581 (commit)
via d4e5c6787c40e27394c336730f59d878a81d1991 (commit)
via 1fb545ad3a8f6d263c9f01300bce978e81b6fe8c (commit)
via 57175d559ee2bdd56c360a3b45aacf13b15b9270 (commit)
via 4cf161a5e7af6f32d76263ac751600577e4d7bd3 (commit)
via 3a298c0bf4e3e86f4705b9255bf032cf70d5cadb (commit)
via 655e98bf7149eb3757a0587409076326edeb9c04 (commit)
via 46e28960a58a25bbf0124b6ab95eda24cc4fe1a4 (commit)
via 5f926a58026c3c750738e26975834b662fc85727 (commit)
via 7c0ec75cfa6860b53036fe46c005b84277cdbc24 (commit)
via 92e98dd909bd399f508ff7c2f9657095ddc766cc (commit)
via 1714c27a74c1616e5998a1a51fe42848a1f1c389 (commit)
from f65616b6488be6dc2181033878ab16790cd42532 (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=813b519280af91336c54310b4c975110303b86b5
commit 813b519280af91336c54310b4c975110303b86b5
Merge: f65616b ba48e63
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 11 13:59:48 2013 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 11 13:59:48 2013 -0500
Merge topic 'minor-fixes'
ba48e63 Generate config-specific interface link libraries propeties.
deb51a7 Remove unused forward declarations.
9712362 Don't allow utility or global targets in the LINKED expression.
faa927e Make sure INTERFACE properties work with OBJECT libraries.
510fdcb Whitelist target types in target_{include_directories,compile_definitions}
4de7178 Ensure that the build interface includes have been added.
df74bc3 Only append build interface include dirs to particular targets.
d4e5c67 Don't keep track of content determined by target property values.
1fb545a Move a special case for PIC from the genex to the cmTarget code.
57175d5 Only use early evaluation termination for transitive properties.
4cf161a Fix determination of evaluating link libraries.
3a298c0 Fix generation of COMPILE_DEFINITIONS in DependInfo.cmake.
655e98b Ensure type specific compatible interface properties do not intersect.
46e2896 The COMPATIBLE_INTERFACE does not affect the target it is set on.
5f926a5 Test printing origin of include dirs from tll().
7c0ec75 De-duplicate validation of genex target names.
...
-----------------------------------------------------------------------
Summary of changes:
Modules/FindQt4.cmake | 24 +++-
Source/cmDocumentVariables.cxx | 7 +-
Source/cmExportFileGenerator.cxx | 10 +--
Source/cmExportInstallFileGenerator.h | 3 -
Source/cmGeneratorExpression.cxx | 28 ++++-
Source/cmGeneratorExpression.h | 8 +-
Source/cmGeneratorExpressionDAGChecker.cxx | 4 +-
Source/cmGeneratorExpressionEvaluator.cxx | 41 ++++---
Source/cmLocalGenerator.cxx | 5 +-
Source/cmLocalGenerator.h | 3 +-
Source/cmLocalUnixMakefileGenerator3.cxx | 27 +----
Source/cmMakefile.cxx | 21 +++-
Source/cmMakefile.h | 2 +-
Source/cmTarget.cxx | 129 +++++++++++---------
Source/cmTarget.h | 7 -
Source/cmTargetIncludeDirectoriesCommand.cxx | 10 +--
Source/cmTargetLinkLibrariesCommand.cxx | 17 +--
Source/cmTargetPropCommandBase.cxx | 9 ++
.../target_link_libraries/CMakeLists.txt | 5 +-
Tests/CompatibleInterface/CMakeLists.txt | 15 +++
Tests/ObjectLibrary/A/CMakeLists.txt | 2 +-
Tests/ObjectLibrary/B/CMakeLists.txt | 6 +-
Tests/ObjectLibrary/B/b.h | 7 +
Tests/ObjectLibrary/CMakeLists.txt | 8 ++
Tests/ObjectLibrary/mainAB.c | 8 +-
Tests/QtAutomoc/Adir/CMakeLists.txt | 8 ++
Tests/QtAutomoc/Adir/libA.cpp | 13 ++
Tests/QtAutomoc/Adir/libA.h | 18 +++
Tests/QtAutomoc/Bdir/CMakeLists.txt | 10 ++
Tests/QtAutomoc/Bdir/libB.cpp | 13 ++
Tests/QtAutomoc/Bdir/libB.h | 21 +++
Tests/QtAutomoc/CMakeLists.txt | 16 +++-
Tests/QtAutomoc/libC.cpp | 13 ++
Tests/QtAutomoc/libC.h | 22 ++++
Tests/QtAutomoc/main.cpp | 4 +
.../InterfaceString-Bool-Conflict-result.txt} | 0
.../InterfaceString-Bool-Conflict-stderr.txt | 5 +
.../InterfaceString-Bool-Conflict.cmake | 9 ++
.../CompatibleInterface/RunCMakeTest.cmake | 1 +
.../BadLinked-UtilityTarget-result.txt} | 0
.../BadLinked-UtilityTarget-stderr.txt | 8 ++
.../BadLinked-UtilityTarget.cmake | 7 +
.../RunCMakeTest.cmake | 1 +
.../TargetPropertyGeneratorExpressions/empty.cpp | 1 +
.../include_directories/DebugIncludes-stderr.txt | 14 ++-
.../include_directories/DebugIncludes.cmake | 5 +
.../include_directories/RunCMakeTest.cmake | 1 +
.../TID-bad-target-result.txt} | 0
.../include_directories/TID-bad-target-stderr.txt | 4 +
.../include_directories/TID-bad-target.cmake | 6 +
50 files changed, 431 insertions(+), 175 deletions(-)
create mode 100644 Tests/QtAutomoc/Adir/CMakeLists.txt
create mode 100644 Tests/QtAutomoc/Adir/libA.cpp
create mode 100644 Tests/QtAutomoc/Adir/libA.h
create mode 100644 Tests/QtAutomoc/Bdir/CMakeLists.txt
create mode 100644 Tests/QtAutomoc/Bdir/libB.cpp
create mode 100644 Tests/QtAutomoc/Bdir/libB.h
create mode 100644 Tests/QtAutomoc/libC.cpp
create mode 100644 Tests/QtAutomoc/libC.h
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => CompatibleInterface/InterfaceString-Bool-Conflict-result.txt} (100%)
create mode 100644 Tests/RunCMake/CompatibleInterface/InterfaceString-Bool-Conflict-stderr.txt
create mode 100644 Tests/RunCMake/CompatibleInterface/InterfaceString-Bool-Conflict.cmake
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => TargetPropertyGeneratorExpressions/BadLinked-UtilityTarget-result.txt} (100%)
create mode 100644 Tests/RunCMake/TargetPropertyGeneratorExpressions/BadLinked-UtilityTarget-stderr.txt
create mode 100644 Tests/RunCMake/TargetPropertyGeneratorExpressions/BadLinked-UtilityTarget.cmake
create mode 100644 Tests/RunCMake/TargetPropertyGeneratorExpressions/empty.cpp
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => include_directories/TID-bad-target-result.txt} (100%)
create mode 100644 Tests/RunCMake/include_directories/TID-bad-target-stderr.txt
create mode 100644 Tests/RunCMake/include_directories/TID-bad-target.cmake
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list