diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx index 830f10022..b9ae7dda8 100644 --- a/Source/cmLocalUnixMakefileGenerator3.cxx +++ b/Source/cmLocalUnixMakefileGenerator3.cxx @@ -300,7 +300,8 @@ void cmLocalUnixMakefileGenerator3 // Add a fast rule to build the target std::string makefileName = this->GetRelativeTargetDirectory(t->second); makefileName += "/build.make"; - std::string makeTargetName = this->GetRelativeTargetDirectory(t->second); + std::string makeTargetName = + this->GetRelativeTargetDirectory(t->second); makeTargetName += "/build"; localName = t->second.GetName(); localName += "/fast"; diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx index 0cc7dadea..84acda3c9 100644 --- a/Source/cmLocalVisualStudio7Generator.cxx +++ b/Source/cmLocalVisualStudio7Generator.cxx @@ -1170,14 +1170,18 @@ void cmLocalVisualStudio7Generator std::string compileFlagsCopy = compileFlags; std::map fileFlagMap; this->FillFlagMapFromCommandFlags - (fileFlagMap, &cmLocalVisualStudio7GeneratorFlagTable[0], compileFlagsCopy); - if(compileFlagsCopy.size() && compileFlagsCopy.find_first_not_of(" ") + (fileFlagMap, + &cmLocalVisualStudio7GeneratorFlagTable[0], + compileFlagsCopy); + if(compileFlagsCopy.size() && + compileFlagsCopy.find_first_not_of(" ") != compileFlagsCopy.npos) { fout << "\t\t\t\t\tAdditionalOptions=\"" << this->EscapeForXML(compileFlagsCopy.c_str()) << "\"\n"; } - for(std::map::iterator m = fileFlagMap.begin(); + for(std::map::iterator m = fileFlagMap.begin(); m != fileFlagMap.end(); ++m) { fout << "\t\t\t\t\t" << m->first << "=\"" << m->second << "\"\n";