diff options
| author | Stephen Kelly <steveire@gmail.com> | 2014-03-11 15:35:58 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2014-03-13 14:27:23 (GMT) |
| commit | d5b2e33be2119ad12744ed62920a8f8d9b6d705d (patch) | |
| tree | 89ed0e46f942715ece3d00e649850af4c7b2d3bd /Source/cmGlobalUnixMakefileGenerator3.cxx | |
| parent | 82a7d54cfe75c399b66c888acfcb5ddb15af547b (diff) | |
| download | CMake-d5b2e33be2119ad12744ed62920a8f8d9b6d705d.zip CMake-d5b2e33be2119ad12744ed62920a8f8d9b6d705d.tar.gz CMake-d5b2e33be2119ad12744ed62920a8f8d9b6d705d.tar.bz2 | |
Makefiles: Compute local object files on demand.
Don't compute them up front.
Diffstat (limited to 'Source/cmGlobalUnixMakefileGenerator3.cxx')
| -rw-r--r-- | Source/cmGlobalUnixMakefileGenerator3.cxx | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx index f5c56a9..0e03e89 100644 --- a/Source/cmGlobalUnixMakefileGenerator3.cxx +++ b/Source/cmGlobalUnixMakefileGenerator3.cxx @@ -109,9 +109,6 @@ cmGlobalUnixMakefileGenerator3 ::ComputeTargetObjects(cmGeneratorTarget* gt) const { cmTarget* target = gt->Target; - cmLocalUnixMakefileGenerator3* lg = - static_cast<cmLocalUnixMakefileGenerator3*>(gt->LocalGenerator); - // Compute full path to object file directory for this target. std::string dir_max; dir_max += gt->Makefile->GetCurrentOutputDirectory(); @@ -128,12 +125,9 @@ cmGlobalUnixMakefileGenerator3 si != objectSources.end(); ++si) { cmSourceFile* sf = *si; - bool hasSourceExtension = true; std::string objectName = gt->LocalGenerator - ->GetObjectFileNameWithoutTarget(*sf, dir_max, - &hasSourceExtension); + ->GetObjectFileNameWithoutTarget(*sf, dir_max); gt->AddObject(sf, objectName); - lg->AddLocalObjectFile(target, sf, objectName, hasSourceExtension); } } |