diff options
| author | Brad King <brad.king@kitware.com> | 2012-03-09 20:15:37 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2012-03-09 20:15:37 (GMT) |
| commit | 51b67366ed9d8e81567cfff1ede2b34d85410933 (patch) | |
| tree | 11c8bd8376a98c5f78cbe501ad1e20347baf7ccb /Source/cmMakefileTargetGenerator.cxx | |
| parent | c7bdef5b48fe74f92d75f538e702257e7de1a998 (diff) | |
| parent | 0996f2a228a834d75ba9845ea6b899b60eb84712 (diff) | |
| download | CMake-51b67366ed9d8e81567cfff1ede2b34d85410933.zip CMake-51b67366ed9d8e81567cfff1ede2b34d85410933.tar.gz CMake-51b67366ed9d8e81567cfff1ede2b34d85410933.tar.bz2 | |
Merge branch 'cleanup-object-file-names' into object-library
Diffstat (limited to 'Source/cmMakefileTargetGenerator.cxx')
| -rw-r--r-- | Source/cmMakefileTargetGenerator.cxx | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx index e5be4aa..b9120c4 100644 --- a/Source/cmMakefileTargetGenerator.cxx +++ b/Source/cmMakefileTargetGenerator.cxx @@ -489,16 +489,8 @@ void cmMakefileTargetGenerator::WriteObjectRuleFiles(cmSourceFile& source) srcFullPath.c_str()); // add this to the list of objects for this local generator - if(cmSystemTools::FileIsFullPath(objNoTargetDir.c_str())) - { - objNoTargetDir = cmSystemTools::GetFilenameName(objNoTargetDir); - } - cmLocalUnixMakefileGenerator3::LocalObjectInfo& info = - this->LocalGenerator->LocalObjectFiles[objNoTargetDir]; - info.HasSourceExtension = hasSourceExtension; - info.push_back( - cmLocalUnixMakefileGenerator3::LocalObjectEntry(this->Target, lang) - ); + this->LocalGenerator->AddLocalObjectFile( + this->Target, &source, objNoTargetDir, hasSourceExtension); } //---------------------------------------------------------------------------- |