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

Replace temporary bool by inlining warning condition.

This commit is contained in:
Stephen Kelly 2015-01-27 22:13:45 +01:00
parent 6cd2ee9524
commit 11093a03e0
1 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/cmLocalGenerator.cxx
View File

@ -3641,15 +3641,10 @@ bool cmLocalGenerator::NeedBackwardsCompatibility_2_4()
bool cmLocalGenerator::CheckDefinition(std::string const& define) const bool cmLocalGenerator::CheckDefinition(std::string const& define) const
{ {
// Many compilers do not support -DNAME(arg)=sdf so we disable it. // Many compilers do not support -DNAME(arg)=sdf so we disable it.
bool function_style = false;
std::string::size_type pos = define.find_first_of("(="); std::string::size_type pos = define.find_first_of("(=");
if (pos != std::string::npos) if (pos != std::string::npos)
{ {
function_style = define[pos] == '('; if (define[pos] == '(')
}
if(function_style)
{ {
std::ostringstream e; std::ostringstream e;
e << "WARNING: Function-style preprocessor definitions may not be " e << "WARNING: Function-style preprocessor definitions may not be "
@ -3660,6 +3655,7 @@ bool cmLocalGenerator::CheckDefinition(std::string const& define) const
cmSystemTools::Message(e.str().c_str()); cmSystemTools::Message(e.str().c_str());
return false; return false;
} }
}
// Many compilers do not support # in the value so we disable it. // Many compilers do not support # in the value so we disable it.
if(define.find_first_of("#") != define.npos) if(define.find_first_of("#") != define.npos)