[Cmake-commits] CMake branch, master, updated. v2.8.7-763-g31c0bc0
David Cole
david.cole at kitware.com
Tue Mar 20 09:34:37 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 31c0bc021940420fcf383bde390c59beb2cd9b9c (commit)
via 93d5509b5b1c208f3ed28daf35f9384ab6918441 (commit)
via 821037cf2e7847ed00e869f2188e20d84379a6db (commit)
via eb24c99c4d8e2b56d8ab86ffa051558b7e14460b (commit)
via 63d1be8b0007feafa69b16fb9c8682c992017c9a (commit)
via 020ba38775875238f3a6ddd52486ccc5944c86fd (commit)
via e8ea61587463f18dd552dc84a55d2091adff3071 (commit)
via 8045e1711907951ec1cb574d7e39c0dcf6471302 (commit)
via 247a132422bd3f1c97f5fcf8457d5a105ab65687 (commit)
via b063599603bd3d2d3cc57495d0d060ac90f0f308 (commit)
via be01f3b098a69570cc382501a3895f424c4a608f (commit)
via 2693dbe085d78951f62487e37e7d75eb4cf7bfdd (commit)
via 51997cb6dc93eff826e95ac326eb9af6763eaa32 (commit)
via 23ec258fce110a63e3d7bde711dc127e220639d4 (commit)
via 61124de4c06b1195e79ee71326b902baf23c4c32 (commit)
via f5b06cda0f187929ac68ed64595c22d4e6ec773c (commit)
via a2514f15fae34abb6f29dddf6f5cfe8b171a8035 (commit)
via c68cc0661218c62f32d11cb600183e645c81a3de (commit)
via cd146c650e092dcbf91adf60ef697608c2ac7fa2 (commit)
via c3242500b62c3f81af46e086cc2225b53c023167 (commit)
via db7ef82402bed3d941bea73d266ac5919f4eee15 (commit)
via 5683101669e677b5b8d7b50d817da54156afd626 (commit)
via 69d3d1835c5f4bdf9fbe5e920517a74d82482455 (commit)
via c403f27a2de2327f5c895972e16a81d80968c40c (commit)
via 34e4985eed3589a4f7ad7dfc14a7a8aa10c8ff97 (commit)
via 3a53005f7dd5e582b855ef1f3c0e6814ce7d024a (commit)
via 3aa741acb6b47d83a0892ddf027ddb0abdc33e78 (commit)
via b87d7a60a0ed146b79c49baedb666db228d5a70f (commit)
via d5aedf15a4a6d7023a7ba73dcf92b24607af4606 (commit)
via f737bd416a49d79db032f97c3046e7eccc6aaea9 (commit)
via 9c0a00d6dd6e7419eba61bcac30bdd0715b8b2cd (commit)
via 46f49406759423dcc6f4050c9ad83c7167bd4dfc (commit)
via d57047de33e096eac6fc84976c733b7941c9add3 (commit)
via 3baaf6ccecb9117b613fc89cd37206960298dfaa (commit)
via 62a841b80b5f4b4f9cc0ddba77ae010a29b0e27e (commit)
via 45c2f93240eb0556b3a8025e154a3dea5e206c7a (commit)
via 4b245580913e02ba577d6eb7825866300d364b53 (commit)
via 11d9b211266865f0ce4a1005bbb18748c0806bce (commit)
via 51b67366ed9d8e81567cfff1ede2b34d85410933 (commit)
from b06f7c077b15de1a2bf354b64092565d0e49d719 (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=31c0bc021940420fcf383bde390c59beb2cd9b9c
commit 31c0bc021940420fcf383bde390c59beb2cd9b9c
Merge: b06f7c0 93d5509
Author: David Cole <david.cole at kitware.com>
AuthorDate: Tue Mar 20 09:34:35 2012 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Mar 20 09:34:35 2012 -0400
Merge topic 'object-library'
93d5509 Merge branch 'ninja-object-library' into object-library
821037c Merge branch 'xcode-object-library' into object-library
eb24c99 Merge branch 'object-library' into xcode-object-library
63d1be8 Xcode: Honor $<TARGET_OBJECTS:...> source expressions
020ba38 Merge branch 'object-library' into xcode-object-library
e8ea615 Build object library targets in Xcode
8045e17 Pre-compute object file names before Xcode generation
247a132 Allow txt files as ExtraSources in object library targets
b063599 Add a default source group for object files.
be01f3b Xcode: Re-factor some existing methods into "FromPath" variants
2693dbe Merge branch 'object-library' into ninja-object-library
51997cb Ninja: Honor $<TARGET_OBJECTS:...> source expressions
23ec258 Merge branch 'object-library' into ninja-object-library
61124de Build object library targets in Ninja
f5b06cd Pre-compute object file names before Ninja generation
a2514f1 Simplify cmNinjaTargetGenerator using cmGeneratorTarget
...
-----------------------------------------------------------------------
Summary of changes:
Source/CMakeLists.txt | 2 +
Source/cmAddLibraryCommand.cxx | 14 +
Source/cmAddLibraryCommand.h | 20 ++
Source/cmComputeLinkDepends.cxx | 13 +
Source/cmExportCommand.cxx | 8 +
Source/cmGeneratorTarget.cxx | 172 ++++++++++
Source/cmGeneratorTarget.h | 63 ++++
Source/cmGlobalGenerator.cxx | 57 ++++-
Source/cmGlobalGenerator.h | 13 +-
Source/cmGlobalNinjaGenerator.cxx | 30 ++
Source/cmGlobalNinjaGenerator.h | 6 +
Source/cmGlobalUnixMakefileGenerator3.cxx | 38 +++
Source/cmGlobalUnixMakefileGenerator3.h | 2 +
Source/cmGlobalVisualStudio10Generator.h | 2 +-
Source/cmGlobalVisualStudio6Generator.h | 2 +-
Source/cmGlobalVisualStudio7Generator.h | 2 +-
Source/cmGlobalVisualStudioGenerator.cxx | 70 ++++-
Source/cmGlobalVisualStudioGenerator.h | 2 +
Source/cmGlobalXCodeGenerator.cxx | 333 ++++++++++++++++----
Source/cmGlobalXCodeGenerator.h | 15 +-
Source/cmInstallCommand.cxx | 11 +-
Source/cmInstallTargetGenerator.cxx | 1 +
Source/cmLocalGenerator.cxx | 4 +
Source/cmLocalNinjaGenerator.cxx | 31 --
Source/cmLocalNinjaGenerator.h | 3 -
Source/cmLocalUnixMakefileGenerator3.cxx | 40 +---
Source/cmLocalUnixMakefileGenerator3.h | 5 -
Source/cmLocalVisualStudio6Generator.cxx | 141 ++++++---
Source/cmLocalVisualStudio6Generator.h | 3 +
Source/cmLocalVisualStudio7Generator.cxx | 126 ++++++--
Source/cmLocalVisualStudio7Generator.h | 6 +-
Source/cmLocalVisualStudioGenerator.cxx | 63 ----
Source/cmLocalVisualStudioGenerator.h | 8 +-
Source/cmMakefile.cxx | 18 +-
Source/cmMakefileLibraryTargetGenerator.cxx | 26 ++
Source/cmMakefileLibraryTargetGenerator.h | 1 +
Source/cmMakefileTargetGenerator.cxx | 137 ++++-----
Source/cmMakefileTargetGenerator.h | 8 +-
Source/cmNinjaNormalTargetGenerator.cxx | 40 ++-
Source/cmNinjaNormalTargetGenerator.h | 1 +
Source/cmNinjaTargetGenerator.cxx | 96 ++++---
Source/cmNinjaTargetGenerator.h | 5 +-
Source/cmSourceGroup.cxx | 6 -
Source/cmSourceGroup.h | 1 -
Source/cmTarget.cxx | 44 +++-
Source/cmTarget.h | 10 +-
Source/cmTargetLinkLibrariesCommand.cxx | 10 +
Source/cmVisualStudio10TargetGenerator.cxx | 124 +++++---
Source/cmVisualStudio10TargetGenerator.h | 4 +-
Tests/CMakeLists.txt | 1 +
Tests/ObjectLibrary/A/CMakeLists.txt | 17 +
Tests/ObjectLibrary/A/a.h | 6 +
Tests/ObjectLibrary/A/a1.c.in | 2 +
Tests/ObjectLibrary/A/a2.c | 2 +
Tests/ObjectLibrary/AB.def | 5 +
Tests/ObjectLibrary/B/CMakeLists.txt | 15 +
Tests/ObjectLibrary/B/b.h | 11 +
Tests/ObjectLibrary/B/b1.c | 2 +
Tests/ObjectLibrary/B/b1_vs6.c | 1 +
Tests/ObjectLibrary/B/b2.c | 2 +
Tests/ObjectLibrary/B/b2_vs6.c | 1 +
Tests/ObjectLibrary/CMakeLists.txt | 52 +++
Tests/ObjectLibrary/c.c | 19 ++
Tests/ObjectLibrary/dummy.c | 1 +
Tests/ObjectLibrary/dummy.obj | Bin 0 -> 498 bytes
Tests/ObjectLibrary/main.c | 16 +
Tests/ObjectLibrary/mainAB.c | 22 ++
Tests/RunCMake/CMakeLists.txt | 2 +
.../BadObjSource1-result.txt} | 0
.../ObjectLibrary/BadObjSource1-stderr.txt | 8 +
Tests/RunCMake/ObjectLibrary/BadObjSource1.cmake | 1 +
.../BadObjSource2-result.txt} | 0
.../ObjectLibrary/BadObjSource2-stderr.txt | 8 +
Tests/RunCMake/ObjectLibrary/BadObjSource2.cmake | 1 +
.../BadSourceExpression1-result.txt} | 0
.../ObjectLibrary/BadSourceExpression1-stderr.txt | 6 +
.../ObjectLibrary/BadSourceExpression1.cmake | 1 +
.../BadSourceExpression2-result.txt} | 0
.../ObjectLibrary/BadSourceExpression2-stderr.txt | 4 +
.../ObjectLibrary/BadSourceExpression2.cmake | 1 +
.../BadSourceExpression3-result.txt} | 0
.../ObjectLibrary/BadSourceExpression3-stderr.txt | 4 +
.../ObjectLibrary/BadSourceExpression3.cmake | 2 +
Tests/RunCMake/ObjectLibrary/CMakeLists.txt | 3 +
.../Export-result.txt} | 0
Tests/RunCMake/ObjectLibrary/Export-stderr.txt | 4 +
Tests/RunCMake/ObjectLibrary/Export.cmake | 2 +
Tests/RunCMake/ObjectLibrary/ExportLanguages.cmake | 15 +
.../Import-result.txt} | 0
Tests/RunCMake/ObjectLibrary/Import-stderr.txt | 4 +
Tests/RunCMake/ObjectLibrary/Import.cmake | 1 +
.../Install-result.txt} | 0
Tests/RunCMake/ObjectLibrary/Install-stderr.txt | 4 +
Tests/RunCMake/ObjectLibrary/Install.cmake | 2 +
.../LinkObjLHS-result.txt} | 0
Tests/RunCMake/ObjectLibrary/LinkObjLHS-stderr.txt | 4 +
Tests/RunCMake/ObjectLibrary/LinkObjLHS.cmake | 2 +
.../LinkObjRHS1-result.txt} | 0
.../RunCMake/ObjectLibrary/LinkObjRHS1-stderr.txt | 6 +
Tests/RunCMake/ObjectLibrary/LinkObjRHS1.cmake | 3 +
.../LinkObjRHS2-result.txt} | 0
.../RunCMake/ObjectLibrary/LinkObjRHS2-stderr.txt | 6 +
Tests/RunCMake/ObjectLibrary/LinkObjRHS2.cmake | 3 +
.../ObjWithObj-result.txt} | 0
Tests/RunCMake/ObjectLibrary/ObjWithObj-stderr.txt | 4 +
Tests/RunCMake/ObjectLibrary/ObjWithObj.cmake | 2 +
.../PostBuild-result.txt} | 0
Tests/RunCMake/ObjectLibrary/PostBuild-stderr.txt | 5 +
Tests/RunCMake/ObjectLibrary/PostBuild.cmake | 4 +
.../PreBuild-result.txt} | 0
Tests/RunCMake/ObjectLibrary/PreBuild-stderr.txt | 5 +
Tests/RunCMake/ObjectLibrary/PreBuild.cmake | 4 +
.../PreLink-result.txt} | 0
Tests/RunCMake/ObjectLibrary/PreLink-stderr.txt | 5 +
Tests/RunCMake/ObjectLibrary/PreLink.cmake | 4 +
Tests/RunCMake/ObjectLibrary/RunCMakeTest.cmake | 18 +
Tests/RunCMake/ObjectLibrary/a.c | 1 +
Tests/RunCMake/ObjectLibrary/a.cxx | 1 +
.../RunCMake/ObjectLibrary/bad.def | 0
.../RunCMake/ObjectLibrary/bad.obj | 0
bootstrap | 1 +
121 files changed, 1686 insertions(+), 477 deletions(-)
create mode 100644 Source/cmGeneratorTarget.cxx
create mode 100644 Source/cmGeneratorTarget.h
create mode 100644 Tests/ObjectLibrary/A/CMakeLists.txt
create mode 100644 Tests/ObjectLibrary/A/a.h
create mode 100644 Tests/ObjectLibrary/A/a1.c.in
create mode 100644 Tests/ObjectLibrary/A/a2.c
create mode 100644 Tests/ObjectLibrary/AB.def
create mode 100644 Tests/ObjectLibrary/B/CMakeLists.txt
create mode 100644 Tests/ObjectLibrary/B/b.h
create mode 100644 Tests/ObjectLibrary/B/b1.c
create mode 100644 Tests/ObjectLibrary/B/b1_vs6.c
create mode 100644 Tests/ObjectLibrary/B/b2.c
create mode 100644 Tests/ObjectLibrary/B/b2_vs6.c
create mode 100644 Tests/ObjectLibrary/CMakeLists.txt
create mode 100644 Tests/ObjectLibrary/c.c
create mode 100644 Tests/ObjectLibrary/dummy.c
create mode 100644 Tests/ObjectLibrary/dummy.obj
create mode 100644 Tests/ObjectLibrary/main.c
create mode 100644 Tests/ObjectLibrary/mainAB.c
copy Tests/RunCMake/{build_command/ErrorsON-result.txt => ObjectLibrary/BadObjSource1-result.txt} (100%)
create mode 100644 Tests/RunCMake/ObjectLibrary/BadObjSource1-stderr.txt
create mode 100644 Tests/RunCMake/ObjectLibrary/BadObjSource1.cmake
copy Tests/RunCMake/{build_command/ErrorsON-result.txt => ObjectLibrary/BadObjSource2-result.txt} (100%)
create mode 100644 Tests/RunCMake/ObjectLibrary/BadObjSource2-stderr.txt
create mode 100644 Tests/RunCMake/ObjectLibrary/BadObjSource2.cmake
copy Tests/RunCMake/{build_command/ErrorsON-result.txt => ObjectLibrary/BadSourceExpression1-result.txt} (100%)
create mode 100644 Tests/RunCMake/ObjectLibrary/BadSourceExpression1-stderr.txt
create mode 100644 Tests/RunCMake/ObjectLibrary/BadSourceExpression1.cmake
copy Tests/RunCMake/{build_command/ErrorsON-result.txt => ObjectLibrary/BadSourceExpression2-result.txt} (100%)
create mode 100644 Tests/RunCMake/ObjectLibrary/BadSourceExpression2-stderr.txt
create mode 100644 Tests/RunCMake/ObjectLibrary/BadSourceExpression2.cmake
copy Tests/RunCMake/{build_command/ErrorsON-result.txt => ObjectLibrary/BadSourceExpression3-result.txt} (100%)
create mode 100644 Tests/RunCMake/ObjectLibrary/BadSourceExpression3-stderr.txt
create mode 100644 Tests/RunCMake/ObjectLibrary/BadSourceExpression3.cmake
create mode 100644 Tests/RunCMake/ObjectLibrary/CMakeLists.txt
copy Tests/RunCMake/{build_command/ErrorsON-result.txt => ObjectLibrary/Export-result.txt} (100%)
create mode 100644 Tests/RunCMake/ObjectLibrary/Export-stderr.txt
create mode 100644 Tests/RunCMake/ObjectLibrary/Export.cmake
create mode 100644 Tests/RunCMake/ObjectLibrary/ExportLanguages.cmake
copy Tests/RunCMake/{build_command/ErrorsON-result.txt => ObjectLibrary/Import-result.txt} (100%)
create mode 100644 Tests/RunCMake/ObjectLibrary/Import-stderr.txt
create mode 100644 Tests/RunCMake/ObjectLibrary/Import.cmake
copy Tests/RunCMake/{build_command/ErrorsON-result.txt => ObjectLibrary/Install-result.txt} (100%)
create mode 100644 Tests/RunCMake/ObjectLibrary/Install-stderr.txt
create mode 100644 Tests/RunCMake/ObjectLibrary/Install.cmake
copy Tests/RunCMake/{build_command/ErrorsON-result.txt => ObjectLibrary/LinkObjLHS-result.txt} (100%)
create mode 100644 Tests/RunCMake/ObjectLibrary/LinkObjLHS-stderr.txt
create mode 100644 Tests/RunCMake/ObjectLibrary/LinkObjLHS.cmake
copy Tests/RunCMake/{build_command/ErrorsON-result.txt => ObjectLibrary/LinkObjRHS1-result.txt} (100%)
create mode 100644 Tests/RunCMake/ObjectLibrary/LinkObjRHS1-stderr.txt
create mode 100644 Tests/RunCMake/ObjectLibrary/LinkObjRHS1.cmake
copy Tests/RunCMake/{build_command/ErrorsON-result.txt => ObjectLibrary/LinkObjRHS2-result.txt} (100%)
create mode 100644 Tests/RunCMake/ObjectLibrary/LinkObjRHS2-stderr.txt
create mode 100644 Tests/RunCMake/ObjectLibrary/LinkObjRHS2.cmake
copy Tests/RunCMake/{build_command/ErrorsON-result.txt => ObjectLibrary/ObjWithObj-result.txt} (100%)
create mode 100644 Tests/RunCMake/ObjectLibrary/ObjWithObj-stderr.txt
create mode 100644 Tests/RunCMake/ObjectLibrary/ObjWithObj.cmake
copy Tests/RunCMake/{build_command/ErrorsON-result.txt => ObjectLibrary/PostBuild-result.txt} (100%)
create mode 100644 Tests/RunCMake/ObjectLibrary/PostBuild-stderr.txt
create mode 100644 Tests/RunCMake/ObjectLibrary/PostBuild.cmake
copy Tests/RunCMake/{build_command/ErrorsON-result.txt => ObjectLibrary/PreBuild-result.txt} (100%)
create mode 100644 Tests/RunCMake/ObjectLibrary/PreBuild-stderr.txt
create mode 100644 Tests/RunCMake/ObjectLibrary/PreBuild.cmake
copy Tests/RunCMake/{build_command/ErrorsON-result.txt => ObjectLibrary/PreLink-result.txt} (100%)
create mode 100644 Tests/RunCMake/ObjectLibrary/PreLink-stderr.txt
create mode 100644 Tests/RunCMake/ObjectLibrary/PreLink.cmake
create mode 100644 Tests/RunCMake/ObjectLibrary/RunCMakeTest.cmake
create mode 100644 Tests/RunCMake/ObjectLibrary/a.c
create mode 100644 Tests/RunCMake/ObjectLibrary/a.cxx
copy Modules/IntelVSImplicitPath/hello.f => Tests/RunCMake/ObjectLibrary/bad.def (100%)
copy Modules/IntelVSImplicitPath/hello.f => Tests/RunCMake/ObjectLibrary/bad.obj (100%)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list