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

Convert: Remove specification of default parameter.

This commit is contained in:
Stephen Kelly 2015-05-18 04:54:27 +02:00 committed by Brad King
parent 20c2fe4d10
commit e54d2fdf50
4 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/cmLocalGenerator.cxx
View File

@ -1838,7 +1838,7 @@ void cmLocalGenerator::OutputLinkLibraries(std::string& linkLibraries,
fdi != fwDirs.end(); ++fdi) fdi != fwDirs.end(); ++fdi)
{ {
frameworkPath += fwSearchFlag; frameworkPath += fwSearchFlag;
frameworkPath += this->Convert(*fdi, NONE, shellFormat, false); frameworkPath += this->Convert(*fdi, NONE, shellFormat);
frameworkPath += " "; frameworkPath += " ";
} }
} }
@ -1892,7 +1892,7 @@ void cmLocalGenerator::OutputLinkLibraries(std::string& linkLibraries,
ri != runtimeDirs.end(); ++ri) ri != runtimeDirs.end(); ++ri)
{ {
rpath += cli.GetRuntimeFlag(); rpath += cli.GetRuntimeFlag();
rpath += this->Convert(*ri, NONE, shellFormat, false); rpath += this->Convert(*ri, NONE, shellFormat);
rpath += " "; rpath += " ";
} }
fout << rpath; fout << rpath;

2
Source/cmMakefileLibraryTargetGenerator.cxx
View File

@ -626,7 +626,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
install_name_dir = install_name_dir =
this->LocalGenerator->Convert(install_name_dir, this->LocalGenerator->Convert(install_name_dir,
cmLocalGenerator::NONE, cmLocalGenerator::NONE,
cmLocalGenerator::SHELL, false); cmLocalGenerator::SHELL);
vars.TargetInstallNameDir = install_name_dir.c_str(); vars.TargetInstallNameDir = install_name_dir.c_str();
} }
} }

3
Source/cmNinjaNormalTargetGenerator.cxx
View File

@ -525,8 +525,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
{ {
vars["INSTALLNAME_DIR"] = localGen.Convert(install_dir, vars["INSTALLNAME_DIR"] = localGen.Convert(install_dir,
cmLocalGenerator::NONE, cmLocalGenerator::NONE,
cmLocalGenerator::SHELL, cmLocalGenerator::SHELL);
false);
} }
} }
} }

3
Source/cmake.cxx
View File

@ -456,8 +456,7 @@ bool cmake::FindPackage(const std::vector<std::string>& args)
std::vector<std::string> includeDirs; std::vector<std::string> includeDirs;
cmSystemTools::ExpandListArgument(includes, includeDirs); cmSystemTools::ExpandListArgument(includes, includeDirs);
std::string includeFlags = lg->GetIncludeFlags(includeDirs, 0, std::string includeFlags = lg->GetIncludeFlags(includeDirs, 0, language);
language, false);
std::string definitions = mf->GetSafeDefinition("PACKAGE_DEFINITIONS"); std::string definitions = mf->GetSafeDefinition("PACKAGE_DEFINITIONS");
printf("%s %s\n", includeFlags.c_str(), definitions.c_str()); printf("%s %s\n", includeFlags.c_str(), definitions.c_str());