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

Makefile: Remove "forbidden" flags only as a whole 

Fix CMAKE_<LANG>_CREATE_SHARED_LIBRARY_FORBIDDEN_FLAGS implementation to
only remove whole flags.  Without this n the Mac we were incorrectly
removing -w from -Wno-write-strings.
This commit is contained in:
Nils Gladitz 2013-11-15 21:41:11 +01:00 committed by Brad King
parent 958367e10c
commit 3a8f34b98c
1 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
Source/cmMakefileTargetGenerator.cxx
View File

@ -27,6 +27,7 @@
#include "cmMakefileLibraryTargetGenerator.h" #include "cmMakefileLibraryTargetGenerator.h"
#include "cmMakefileUtilityTargetGenerator.h" #include "cmMakefileUtilityTargetGenerator.h"
#include <ctype.h>
cmMakefileTargetGenerator::cmMakefileTargetGenerator(cmTarget* target) cmMakefileTargetGenerator::cmMakefileTargetGenerator(cmTarget* target)
: OSXBundleGenerator(0) : OSXBundleGenerator(0)
@ -1694,10 +1695,42 @@ void cmMakefileTargetGenerator::RemoveForbiddenFlags(const char* flagVar,
this->Makefile->GetSafeDefinition(removeFlags.c_str()); this->Makefile->GetSafeDefinition(removeFlags.c_str());
std::vector<std::string> removeList; std::vector<std::string> removeList;
cmSystemTools::ExpandListArgument(removeflags, removeList); cmSystemTools::ExpandListArgument(removeflags, removeList);
for(std::vector<std::string>::iterator i = removeList.begin(); for(std::vector<std::string>::iterator i = removeList.begin();
i != removeList.end(); ++i) i != removeList.end(); ++i)
{ {
cmSystemTools::ReplaceString(linkFlags, i->c_str(), ""); std::string tmp;
std::string::size_type lastPosition = 0;
for(;;)
{
std::string::size_type position = linkFlags.find(*i, lastPosition);
if(position == std::string::npos)
{
tmp += linkFlags.substr(lastPosition);
break;
}
else
{
std::string::size_type prefixLength = position - lastPosition;
tmp += linkFlags.substr(lastPosition, prefixLength);
lastPosition = position + i->length();
bool validFlagStart = position == 0 ||
isspace(linkFlags[position - 1]);
bool validFlagEnd = lastPosition == linkFlags.size() ||
isspace(linkFlags[lastPosition]);
if(!validFlagStart || !validFlagEnd)
{
tmp += *i;
}
}
}
linkFlags = tmp;
} }
} }