diff options
| author | Brad King <brad.king@kitware.com> | 2014-03-17 14:00:43 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-03-17 14:00:43 (GMT) |
| commit | b16f26f5f9cd033e24bbf398faf32369d7305bd7 (patch) | |
| tree | 8502bd90002024b356d85ce8d3920c0fd65db118 /Source/cmLocalGenerator.h | |
| parent | 41b82db6855a26d01e1000b59da1792b954b326a (diff) | |
| parent | 6c9dd0ec7b1e000b0bedd567fa52074671d639c9 (diff) | |
| download | CMake-b16f26f5f9cd033e24bbf398faf32369d7305bd7.zip CMake-b16f26f5f9cd033e24bbf398faf32369d7305bd7.tar.gz CMake-b16f26f5f9cd033e24bbf398faf32369d7305bd7.tar.bz2 | |
Merge topic 'target-objects-refactor'
6c9dd0ec cmGlobalGenerator: Make ComputeTargetObjects non-virtual
c481fadc cmGeneratorTarget: Don't store ObjectSources for object libraries.
f6da0440 cmLocalGenerator: Add ComputeObjectFilenames interface.
9ad804ac cmGeneratorTarget: Constify cmSourceFile* in containers.
c725bb3c Constify some APIs in generators.
dcfcd23e cmGeneratorTarget: Make GetSourceDepends const.
04cf50ff cmOSXBundleGenerator: Make MacOSXContentGeneratorType arg const.
6132d979 cmGeneratorTarget: Constify the AddExplicitObjectName API.
bc512211 cmGeneratorTarget: Constify the AddObject API.
cd43433d cmGlobalGenerator: Extract a ComputeTargetObjectDirectory interface.
d5b2e33b Makefiles: Compute local object files on demand.
Diffstat (limited to 'Source/cmLocalGenerator.h')
| -rw-r--r-- | Source/cmLocalGenerator.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h index afcaee9..61488fe 100644 --- a/Source/cmLocalGenerator.h +++ b/Source/cmLocalGenerator.h @@ -372,6 +372,10 @@ public: std::string& linkPath, cmGeneratorTarget* target); + virtual void ComputeObjectFilenames( + std::map<cmSourceFile const*, std::string>& mapping, + cmGeneratorTarget const* gt = 0); + protected: ///! put all the libraries for a target on into the given stream virtual void OutputLinkLibraries(std::string& linkLibraries, |