diff options
| author | Brad King <brad.king@kitware.com> | 2014-01-06 14:46:55 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-01-06 14:46:55 (GMT) |
| commit | 5e3458830e49e432d31b0aad8a86e35be640afdc (patch) | |
| tree | 6f4d8ca4a1fa70c9998b74ea06c71ac9d514be6e /Source/cmMakefileLibraryTargetGenerator.cxx | |
| parent | 1ab31dc2ebb608b653760a06e526139e832190f8 (diff) | |
| parent | 03f3b4e727d7d5f6c3ba4f0a64a2f440cff43a7d (diff) | |
| download | CMake-5e3458830e49e432d31b0aad8a86e35be640afdc.zip CMake-5e3458830e49e432d31b0aad8a86e35be640afdc.tar.gz CMake-5e3458830e49e432d31b0aad8a86e35be640afdc.tar.bz2 | |
Merge branch 'fix-compile-OBJECT_DIR' into release
Diffstat (limited to 'Source/cmMakefileLibraryTargetGenerator.cxx')
| -rw-r--r-- | Source/cmMakefileLibraryTargetGenerator.cxx | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx b/Source/cmMakefileLibraryTargetGenerator.cxx index ea9663f..ffe68e5 100644 --- a/Source/cmMakefileLibraryTargetGenerator.cxx +++ b/Source/cmMakefileLibraryTargetGenerator.cxx @@ -577,13 +577,11 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules vars.CMTarget = this->Target; vars.Language = linkLanguage; vars.Objects = buildObjs.c_str(); - std::string objdir = cmake::GetCMakeFilesDirectoryPostSlash(); - objdir += this->Target->GetName(); - objdir += ".dir"; - objdir = this->Convert(objdir.c_str(), - cmLocalGenerator::START_OUTPUT, - cmLocalGenerator::SHELL); - vars.ObjectDir = objdir.c_str(); + std::string objectDir = this->Target->GetSupportDirectory(); + objectDir = this->Convert(objectDir.c_str(), + cmLocalGenerator::START_OUTPUT, + cmLocalGenerator::SHELL); + vars.ObjectDir = objectDir.c_str(); vars.Target = targetOutPathReal.c_str(); vars.LinkLibraries = linkLibs.c_str(); vars.ObjectsQuoted = buildObjs.c_str(); |