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

ENH: allow for -gdwarf-2 to be in cflags or cxxflags for xcode

This commit is contained in:
Bill Hoffman 2006-10-13 11:53:12 -04:00
parent 5a0af03170
commit 5330a03994
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Source/cmGlobalXCodeGenerator.cxx
View File

@ -866,17 +866,11 @@ std::string cmGlobalXCodeGenerator::ExtractFlag(const char* flag,
std::string::size_type pos = flags.find(flag); std::string::size_type pos = flags.find(flag);
if(pos != flags.npos) if(pos != flags.npos)
{ {
retFlag = flag; while(pos < flags.size() && flags[pos] != ' ')
// remove the flag
flags[pos]=' ';
flags[pos+1]=' ';
char pos2 = flags[pos+2];
// if the pos after the option
if(pos2 != ' ' && pos2 != 0 )
{ {
retFlag += pos2; retFlag += flags[pos];
// remove the next part of the flag flags[pos] = ' ';
flags[pos+2] = ' '; pos++;
} }
} }
return retFlag; return retFlag;
@ -1392,7 +1386,19 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
optLevel[0] = '1'; optLevel[0] = '1';
} }
std::string gflagc = this->ExtractFlag("-g", cflags); std::string gflagc = this->ExtractFlag("-g", cflags);
// put back gdwarf-2 if used since there is no way
// to represent it in the gui, but we still want debug yes
if(gflagc == "-gdwarf-2")
{
cflags += " ";
cflags += gflagc;
}
std::string gflag = this->ExtractFlag("-g", flags); std::string gflag = this->ExtractFlag("-g", flags);
if(gflag == "-gdwarf-2")
{
flags += " ";
flags += gflag;
}
const char* debugStr = "YES"; const char* debugStr = "YES";
if(gflagc.size() ==0 && gflag.size() == 0) if(gflagc.size() ==0 && gflag.size() == 0)
{ {