cmIDEOptions: Add support for case-insensitive flags
This commit is contained in:
parent
cedbb7994d
commit
4ca9df8bd1
|
@ -32,6 +32,7 @@ struct cmIDEFlagTable
|
||||||
// /NODEFAULTLIB: =>
|
// /NODEFAULTLIB: =>
|
||||||
// IgnoreDefaultLibraryNames)
|
// IgnoreDefaultLibraryNames)
|
||||||
UserFollowing = (1<<5), // expect value in following argument
|
UserFollowing = (1<<5), // expect value in following argument
|
||||||
|
CaseInsensitive = (1<<6), // flag may be any case
|
||||||
|
|
||||||
UserValueIgnored = UserValue | UserIgnored,
|
UserValueIgnored = UserValue | UserIgnored,
|
||||||
UserValueRequired = UserValue | UserRequired
|
UserValueRequired = UserValue | UserRequired
|
||||||
|
|
|
@ -13,6 +13,8 @@
|
||||||
|
|
||||||
#include "cmSystemTools.h"
|
#include "cmSystemTools.h"
|
||||||
|
|
||||||
|
#include <cmsys/String.h>
|
||||||
|
|
||||||
//----------------------------------------------------------------------------
|
//----------------------------------------------------------------------------
|
||||||
cmIDEOptions::cmIDEOptions()
|
cmIDEOptions::cmIDEOptions()
|
||||||
{
|
{
|
||||||
|
@ -104,7 +106,9 @@ bool cmIDEOptions::CheckFlagTable(cmIDEFlagTable const* table,
|
||||||
// the entry specifies UserRequired we must match only if a
|
// the entry specifies UserRequired we must match only if a
|
||||||
// non-empty value is given.
|
// non-empty value is given.
|
||||||
int n = static_cast<int>(strlen(entry->commandFlag));
|
int n = static_cast<int>(strlen(entry->commandFlag));
|
||||||
if(strncmp(flag+1, entry->commandFlag, n) == 0 &&
|
if((strncmp(flag+1, entry->commandFlag, n) == 0 ||
|
||||||
|
(entry->special & cmIDEFlagTable::CaseInsensitive &&
|
||||||
|
cmsysString_strncasecmp(flag+1, entry->commandFlag, n))) &&
|
||||||
(!(entry->special & cmIDEFlagTable::UserRequired) ||
|
(!(entry->special & cmIDEFlagTable::UserRequired) ||
|
||||||
static_cast<int>(strlen(flag+1)) > n))
|
static_cast<int>(strlen(flag+1)) > n))
|
||||||
{
|
{
|
||||||
|
@ -112,7 +116,9 @@ bool cmIDEOptions::CheckFlagTable(cmIDEFlagTable const* table,
|
||||||
entry_found = true;
|
entry_found = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if(strcmp(flag+1, entry->commandFlag) == 0)
|
else if(strcmp(flag+1, entry->commandFlag) == 0 ||
|
||||||
|
(entry->special & cmIDEFlagTable::CaseInsensitive &&
|
||||||
|
cmsysString_strcasecmp(flag+1, entry->commandFlag) == 0))
|
||||||
{
|
{
|
||||||
if(entry->special & cmIDEFlagTable::UserFollowing)
|
if(entry->special & cmIDEFlagTable::UserFollowing)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue