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

cmFindProgramCommand: Use Names member instead of passing it

This commit is contained in:
Brad King 2015-09-01 13:42:14 -04:00
parent bf32b95efe
commit ed4de3c984
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Source/cmFindProgramCommand.cxx
View File

@ -41,7 +41,7 @@ bool cmFindProgramCommand
return true;
}
std::string result = FindProgram(this->Names);
std::string result = FindProgram();
if(result != "")
{
// Save the value in the cache
@ -59,31 +59,30 @@ bool cmFindProgramCommand
return true;
}
std::string cmFindProgramCommand::FindProgram(std::vector<std::string> names)
std::string cmFindProgramCommand::FindProgram()
{
std::string program = "";
if(this->SearchAppBundleFirst || this->SearchAppBundleOnly)
{
program = FindAppBundle(names);
program = FindAppBundle();
}
if(program.empty() && !this->SearchAppBundleOnly)
{
program = cmSystemTools::FindProgram(names, this->SearchPaths, true);
program = cmSystemTools::FindProgram(this->Names, this->SearchPaths, true);
}
if(program.empty() && this->SearchAppBundleLast)
{
program = this->FindAppBundle(names);
program = this->FindAppBundle();
}
return program;
}
std::string cmFindProgramCommand
::FindAppBundle(std::vector<std::string> names)
std::string cmFindProgramCommand::FindAppBundle()
{
for(std::vector<std::string>::const_iterator name = names.begin();
name != names.end() ; ++name)
for(std::vector<std::string>::const_iterator name = this->Names.begin();
name != this->Names.end() ; ++name)
{
std::string appName = *name + std::string(".app");

6
Source/cmFindProgramCommand.h
View File

@ -52,11 +52,9 @@ public:
cmTypeMacro(cmFindProgramCommand, cmFindBase);
protected:
std::string FindProgram(std::vector<std::string> names);
private:
std::string FindAppBundle(std::vector<std::string> names);
std::string FindProgram();
std::string FindAppBundle();
std::string GetBundleExecutable(std::string bundlePath);
};