Convert: Remove specification of default parameter.
This commit is contained in:
parent
20c2fe4d10
commit
e54d2fdf50
|
@ -1838,7 +1838,7 @@ void cmLocalGenerator::OutputLinkLibraries(std::string& linkLibraries,
|
|||
fdi != fwDirs.end(); ++fdi)
|
||||
{
|
||||
frameworkPath += fwSearchFlag;
|
||||
frameworkPath += this->Convert(*fdi, NONE, shellFormat, false);
|
||||
frameworkPath += this->Convert(*fdi, NONE, shellFormat);
|
||||
frameworkPath += " ";
|
||||
}
|
||||
}
|
||||
|
@ -1892,7 +1892,7 @@ void cmLocalGenerator::OutputLinkLibraries(std::string& linkLibraries,
|
|||
ri != runtimeDirs.end(); ++ri)
|
||||
{
|
||||
rpath += cli.GetRuntimeFlag();
|
||||
rpath += this->Convert(*ri, NONE, shellFormat, false);
|
||||
rpath += this->Convert(*ri, NONE, shellFormat);
|
||||
rpath += " ";
|
||||
}
|
||||
fout << rpath;
|
||||
|
|
|
@ -626,7 +626,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
|
|||
install_name_dir =
|
||||
this->LocalGenerator->Convert(install_name_dir,
|
||||
cmLocalGenerator::NONE,
|
||||
cmLocalGenerator::SHELL, false);
|
||||
cmLocalGenerator::SHELL);
|
||||
vars.TargetInstallNameDir = install_name_dir.c_str();
|
||||
}
|
||||
}
|
||||
|
|
|
@ -525,8 +525,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
|
|||
{
|
||||
vars["INSTALLNAME_DIR"] = localGen.Convert(install_dir,
|
||||
cmLocalGenerator::NONE,
|
||||
cmLocalGenerator::SHELL,
|
||||
false);
|
||||
cmLocalGenerator::SHELL);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -456,8 +456,7 @@ bool cmake::FindPackage(const std::vector<std::string>& args)
|
|||
std::vector<std::string> includeDirs;
|
||||
cmSystemTools::ExpandListArgument(includes, includeDirs);
|
||||
|
||||
std::string includeFlags = lg->GetIncludeFlags(includeDirs, 0,
|
||||
language, false);
|
||||
std::string includeFlags = lg->GetIncludeFlags(includeDirs, 0, language);
|
||||
|
||||
std::string definitions = mf->GetSafeDefinition("PACKAGE_DEFINITIONS");
|
||||
printf("%s %s\n", includeFlags.c_str(), definitions.c_str());
|
||||
|
|
Loading…
Reference in New Issue