mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-23 22:58:37 -05:00
Code Issues Packages Projects Releases Wiki Activity

cmMakefile: Rename GetCurrent{,Source}Directory.

Browse Source 
Match the names used in cmake code.
This commit is contained in:
Stephen Kelly
2015-04-16 21:17:41 +02:00
parent b23cf06f86
commit 55d80d0a85
31 changed files with 65 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmInstallCommand.cxx
+3 -3
View File
@@ -163,7 +163,7 @@ bool cmInstallCommand::HandleScriptMode(std::vector<std::string> const& args)
std::string script = args[i];
if(!cmSystemTools::FileIsFullPath(script.c_str()))
{
script = this->Makefile->GetCurrentDirectory();
script = this->Makefile->GetCurrentSourceDirectory();
script += "/";
script += args[i];
}
@@ -1093,7 +1093,7 @@ cmInstallCommand::HandleDirectoryMode(std::vector<std::string> const& args)
std::string dir = args[i];
if(!cmSystemTools::FileIsFullPath(dir.c_str()))
{
dir = this->Makefile->GetCurrentDirectory();
dir = this->Makefile->GetCurrentSourceDirectory();
dir += "/";
dir += args[i];
}
@@ -1376,7 +1376,7 @@ bool cmInstallCommand::MakeFilesFullPath(const char* modeName,
std::string::size_type gpos = cmGeneratorExpression::Find(file);
if(gpos != 0 && !cmSystemTools::FileIsFullPath(file.c_str()))
{
file = this->Makefile->GetCurrentDirectory();
file = this->Makefile->GetCurrentSourceDirectory();
file += "/";
file += *fileIt;
}