diff options
| author | Ken Martin <ken.martin@kitware.com> | 2006-06-14 16:28:32 (GMT) |
|---|---|---|
| committer | Ken Martin <ken.martin@kitware.com> | 2006-06-14 16:28:32 (GMT) |
| commit | 8e9a6becccc739e8135d5a3b303e8bf125fe3015 (patch) | |
| tree | 4d7cbd51dd9ce0b7ecb79bcde0b4439c912383e7 /Source/cmMakefileLibraryTargetGenerator.cxx | |
| parent | 108839ffda95fc54296d05dec176ff3a6ed6f02c (diff) | |
| download | CMake-8e9a6becccc739e8135d5a3b303e8bf125fe3015.zip CMake-8e9a6becccc739e8135d5a3b303e8bf125fe3015.tar.gz CMake-8e9a6becccc739e8135d5a3b303e8bf125fe3015.tar.bz2 | |
ENH: centralized locaiton of CMakeFiles setting
Diffstat (limited to 'Source/cmMakefileLibraryTargetGenerator.cxx')
| -rw-r--r-- | Source/cmMakefileLibraryTargetGenerator.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx b/Source/cmMakefileLibraryTargetGenerator.cxx index c3df2a5..a292605 100644 --- a/Source/cmMakefileLibraryTargetGenerator.cxx +++ b/Source/cmMakefileLibraryTargetGenerator.cxx @@ -22,6 +22,7 @@ #include "cmMakefile.h" #include "cmSourceFile.h" #include "cmTarget.h" +#include "cmake.h" //---------------------------------------------------------------------------- void cmMakefileLibraryTargetGenerator::WriteRuleFiles() @@ -244,7 +245,8 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules if(relink) { outpath = this->Makefile->GetStartOutputDirectory(); - outpath += "/CMakeFiles/CMakeRelink.dir"; + outpath += cmake::GetCMakeFilesDirectory(); + outpath += "/CMakeRelink.dir"; cmSystemTools::MakeDirectory(outpath.c_str()); outpath += "/"; } @@ -428,7 +430,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules vars.TargetPDB = targetOutPathPDB.c_str(); vars.Language = linkLanguage; vars.Objects = buildObjs.c_str(); - std::string objdir = "CMakeFiles/"; + std::string objdir = cmake::GetCMakeFilesDirectoryPostSlash(); objdir += this->Target->GetName(); objdir += ".dir"; vars.ObjectDir = objdir.c_str(); |