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

Remove trailing whitespace 

Alex
This commit is contained in:
Alex Neundorf 2011-08-16 01:44:13 +02:00
parent c27607baf8
commit cbaac2a587
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Source/cmGlobalGenerator.cxx
View File

@ -269,7 +269,7 @@ cmGlobalGenerator::EnableLanguage(std::vector<std::string>const& languages,
cmOStringStream windowsVersionString; cmOStringStream windowsVersionString;
windowsVersionString << osvi.dwMajorVersion << "." << osvi.dwMinorVersion; windowsVersionString << osvi.dwMajorVersion << "." << osvi.dwMinorVersion;
windowsVersionString.str(); windowsVersionString.str();
mf->AddDefinition("CMAKE_HOST_SYSTEM_VERSION", mf->AddDefinition("CMAKE_HOST_SYSTEM_VERSION",
windowsVersionString.str().c_str()); windowsVersionString.str().c_str());
#endif #endif
// Read the DetermineSystem file // Read the DetermineSystem file
@ -618,8 +618,8 @@ void cmGlobalGenerator::SetLanguageEnabledMaps(const char* l, cmMakefile* mf)
if (sscanf(linkerPref, "%d", &preference)!=1) if (sscanf(linkerPref, "%d", &preference)!=1)
{ {
// backward compatibility: before 2.6 LINKER_PREFERENCE // backward compatibility: before 2.6 LINKER_PREFERENCE
// was either "None" or "Prefered", and only the first character was // was either "None" or "Prefered", and only the first character was
// tested. So if there is a custom language out there and it is // tested. So if there is a custom language out there and it is
// "Prefered", set its preference high // "Prefered", set its preference high
if (linkerPref[0]=='P') if (linkerPref[0]=='P')
{ {
@ -1019,9 +1019,9 @@ void cmGlobalGenerator::CheckLocalGenerators()
if(notFoundMap.size()) if(notFoundMap.size())
{ {
std::string notFoundVars; std::string notFoundVars;
for(std::map<cmStdString, cmStdString>::const_iterator for(std::map<cmStdString, cmStdString>::const_iterator
ii = notFoundMap.begin(); ii = notFoundMap.begin();
ii != notFoundMap.end(); ii != notFoundMap.end();
++ii) ++ii)
{ {
notFoundVars += ii->first; notFoundVars += ii->first;
@ -1057,7 +1057,7 @@ int cmGlobalGenerator::TryCompile(const char *srcdir, const char *bindir,
{ {
this->FirstTimeProgress = 0.95f; this->FirstTimeProgress = 0.95f;
} }
this->CMakeInstance->UpdateProgress("Configuring", this->CMakeInstance->UpdateProgress("Configuring",
this->FirstTimeProgress); this->FirstTimeProgress);
} }
@ -1161,7 +1161,7 @@ int cmGlobalGenerator::Build(
{ {
outputPtr = &outputBuffer; outputPtr = &outputBuffer;
} }
// should we do a clean first? // should we do a clean first?
if (clean) if (clean)
{ {
@ -1199,7 +1199,7 @@ int cmGlobalGenerator::Build(
// now build // now build
std::string makeCommand = std::string makeCommand =
this->GenerateBuildCommand(makeCommandCSTR, projectName, this->GenerateBuildCommand(makeCommandCSTR, projectName,
extraOptions, target, extraOptions, target,
config, false, fast); config, false, fast);
if(output) if(output)
{ {
@ -1272,8 +1272,8 @@ void cmGlobalGenerator::AddLocalGenerator(cmLocalGenerator *lg)
if(this->FirstTimeProgress > 0.95f) if(this->FirstTimeProgress > 0.95f)
{ {
this->FirstTimeProgress = 0.95f; this->FirstTimeProgress = 0.95f;
} }
this->CMakeInstance->UpdateProgress("Configuring", this->CMakeInstance->UpdateProgress("Configuring",
this->FirstTimeProgress); this->FirstTimeProgress);
return; return;
} }
@ -1296,8 +1296,8 @@ void cmGlobalGenerator::AddInstallComponent(const char* component)
} }
} }
void cmGlobalGenerator::AddTargetToExports(const char* exportSetName, void cmGlobalGenerator::AddTargetToExports(const char* exportSetName,
cmTarget* target, cmTarget* target,
cmInstallTargetGenerator* archive, cmInstallTargetGenerator* archive,
cmInstallTargetGenerator* runTime, cmInstallTargetGenerator* runTime,
cmInstallTargetGenerator* library, cmInstallTargetGenerator* library,
@ -1331,7 +1331,7 @@ void cmGlobalGenerator::ClearExportSets()
const std::vector<cmTargetExport*>* cmGlobalGenerator::GetExportSet( const std::vector<cmTargetExport*>* cmGlobalGenerator::GetExportSet(
const char* name) const const char* name) const
{ {
std::map<cmStdString, std::vector<cmTargetExport*> >::const_iterator std::map<cmStdString, std::vector<cmTargetExport*> >::const_iterator
exportSetIt = this->ExportSets.find(name); exportSetIt = this->ExportSets.find(name);
if (exportSetIt != this->ExportSets.end()) if (exportSetIt != this->ExportSets.end())
{ {
@ -1443,7 +1443,7 @@ void cmGlobalGenerator::GetEnabledLanguages(std::vector<std::string>& lang)
int cmGlobalGenerator::GetLinkerPreference(const char* lang) int cmGlobalGenerator::GetLinkerPreference(const char* lang)
{ {
std::map<cmStdString, int>::const_iterator it = std::map<cmStdString, int>::const_iterator it =
this->LanguageToLinkerPreference.find(lang); this->LanguageToLinkerPreference.find(lang);
if (it != this->LanguageToLinkerPreference.end()) if (it != this->LanguageToLinkerPreference.end())
{ {