kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use LocalGenerator when possible

Browse Source
This commit is contained in:
Stephen Kelly 2015-10-22 00:29:36 +02:00
parent d90c9738da
commit ce43ed2cc1
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmGlobalVisualStudioGenerator.cxx
View File

@ -147,7 +147,7 @@ void cmGlobalVisualStudioGenerator::AddExtraIDETargets()
void cmGlobalVisualStudioGenerator void cmGlobalVisualStudioGenerator
::ComputeTargetObjectDirectory(cmGeneratorTarget* gt) const ::ComputeTargetObjectDirectory(cmGeneratorTarget* gt) const
{ {
std::string dir = gt->Makefile->GetCurrentBinaryDirectory(); std::string dir = gt->LocalGenerator->GetCurrentBinaryDirectory();
dir += "/"; dir += "/";
std::string tgtDir = gt->LocalGenerator->GetTargetDirectory(gt); std::string tgtDir = gt->LocalGenerator->GetTargetDirectory(gt);
if(!tgtDir.empty()) if(!tgtDir.empty())

2
Source/cmLocalNinjaGenerator.cxx
View File

@ -42,7 +42,7 @@ void cmLocalNinjaGenerator::Generate()
// Compute the path to use when referencing the current output // Compute the path to use when referencing the current output
// directory from the top output directory. // directory from the top output directory.
this->HomeRelativeOutputPath = this->HomeRelativeOutputPath =
this->Convert(this->Makefile->GetCurrentBinaryDirectory(), HOME_OUTPUT); this->Convert(this->GetCurrentBinaryDirectory(), HOME_OUTPUT);
if(this->HomeRelativeOutputPath == ".") if(this->HomeRelativeOutputPath == ".")
{ {
this->HomeRelativeOutputPath = ""; this->HomeRelativeOutputPath = "";

20
Source/cmLocalUnixMakefileGenerator3.cxx
View File

@ -144,7 +144,7 @@ void cmLocalUnixMakefileGenerator3::ComputeHomeRelativeOutputPath()
// Compute the path to use when referencing the current output // Compute the path to use when referencing the current output
// directory from the top output directory. // directory from the top output directory.
this->HomeRelativeOutputPath = this->HomeRelativeOutputPath =
this->Convert(this->Makefile->GetCurrentBinaryDirectory(), HOME_OUTPUT); this->Convert(this->GetCurrentBinaryDirectory(), HOME_OUTPUT);
if(this->HomeRelativeOutputPath == ".") if(this->HomeRelativeOutputPath == ".")
{ {
this->HomeRelativeOutputPath = ""; this->HomeRelativeOutputPath = "";
@ -503,7 +503,7 @@ void cmLocalUnixMakefileGenerator3
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void cmLocalUnixMakefileGenerator3::WriteDirectoryInformationFile() void cmLocalUnixMakefileGenerator3::WriteDirectoryInformationFile()
{ {
std::string infoFileName = this->Makefile->GetCurrentBinaryDirectory(); std::string infoFileName = this->GetCurrentBinaryDirectory();
infoFileName += cmake::GetCMakeFilesDirectory(); infoFileName += cmake::GetCMakeFilesDirectory();
infoFileName += "/CMakeDirectoryInformation.cmake"; infoFileName += "/CMakeDirectoryInformation.cmake";
@ -567,7 +567,7 @@ std::string
cmLocalUnixMakefileGenerator3 cmLocalUnixMakefileGenerator3
::ConvertToFullPath(const std::string& localPath) ::ConvertToFullPath(const std::string& localPath)
{ {
std::string dir = this->Makefile->GetCurrentBinaryDirectory(); std::string dir = this->GetCurrentBinaryDirectory();
dir += "/"; dir += "/";
dir += localPath; dir += localPath;
return dir; return dir;
@ -1064,7 +1064,7 @@ cmLocalUnixMakefileGenerator3
} }
// if the command specified a working directory use it. // if the command specified a working directory use it.
std::string dir = this->Makefile->GetCurrentBinaryDirectory(); std::string dir = this->GetCurrentBinaryDirectory();
std::string workingDir = ccg.GetWorkingDirectory(); std::string workingDir = ccg.GetWorkingDirectory();
if(!workingDir.empty()) if(!workingDir.empty())
{ {
@ -1214,7 +1214,7 @@ cmLocalUnixMakefileGenerator3
const std::vector<std::string>& files, const std::vector<std::string>& files,
cmGeneratorTarget* target, const char* filename) cmGeneratorTarget* target, const char* filename)
{ {
std::string cleanfile = this->Makefile->GetCurrentBinaryDirectory(); std::string cleanfile = this->GetCurrentBinaryDirectory();
cleanfile += "/"; cleanfile += "/";
cleanfile += this->GetTargetDirectory(target); cleanfile += this->GetTargetDirectory(target);
cleanfile += "/cmake_clean"; cleanfile += "/cmake_clean";
@ -1493,7 +1493,7 @@ bool cmLocalUnixMakefileGenerator3::UpdateDependencies(const char* tgtInfo,
// If the directory information is newer than depend.internal, include dirs // If the directory information is newer than depend.internal, include dirs
// may have changed. In this case discard all old dependencies. // may have changed. In this case discard all old dependencies.
bool needRescanDirInfo = false; bool needRescanDirInfo = false;
std::string dirInfoFile = this->Makefile->GetCurrentBinaryDirectory(); std::string dirInfoFile = this->GetCurrentBinaryDirectory();
dirInfoFile += cmake::GetCMakeFilesDirectory(); dirInfoFile += cmake::GetCMakeFilesDirectory();
dirInfoFile += "/CMakeDirectoryInformation.cmake"; dirInfoFile += "/CMakeDirectoryInformation.cmake";
{ {
@ -1567,7 +1567,7 @@ cmLocalUnixMakefileGenerator3
// Read the directory information file. // Read the directory information file.
cmMakefile* mf = this->Makefile; cmMakefile* mf = this->Makefile;
bool haveDirectoryInfo = false; bool haveDirectoryInfo = false;
std::string dirInfoFile = this->Makefile->GetCurrentBinaryDirectory(); std::string dirInfoFile = this->GetCurrentBinaryDirectory();
dirInfoFile += cmake::GetCMakeFilesDirectory(); dirInfoFile += cmake::GetCMakeFilesDirectory();
dirInfoFile += "/CMakeDirectoryInformation.cmake"; dirInfoFile += "/CMakeDirectoryInformation.cmake";
if(mf->ReadListFile(dirInfoFile.c_str()) && if(mf->ReadListFile(dirInfoFile.c_str()) &&
@ -1828,7 +1828,7 @@ void cmLocalUnixMakefileGenerator3
std::vector<std::string> commands; std::vector<std::string> commands;
// Write the all rule. // Write the all rule.
std::string recursiveTarget = this->Makefile->GetCurrentBinaryDirectory(); std::string recursiveTarget = this->GetCurrentBinaryDirectory();
recursiveTarget += "/all"; recursiveTarget += "/all";
depends.push_back("cmake_check_build_system"); depends.push_back("cmake_check_build_system");
@ -1872,7 +1872,7 @@ void cmLocalUnixMakefileGenerator3
depends, commands, true); depends, commands, true);
// Write the clean rule. // Write the clean rule.
recursiveTarget = this->Makefile->GetCurrentBinaryDirectory(); recursiveTarget = this->GetCurrentBinaryDirectory();
recursiveTarget += "/clean"; recursiveTarget += "/clean";
commands.clear(); commands.clear();
depends.clear(); depends.clear();
@ -1890,7 +1890,7 @@ void cmLocalUnixMakefileGenerator3
depends, commands, true); depends, commands, true);
// Write the preinstall rule. // Write the preinstall rule.
recursiveTarget = this->Makefile->GetCurrentBinaryDirectory(); recursiveTarget = this->GetCurrentBinaryDirectory();
recursiveTarget += "/preinstall"; recursiveTarget += "/preinstall";
commands.clear(); commands.clear();
depends.clear(); depends.clear();