Store includes from the same include_directories call together.
Otherwise, we get a separate IncludeDirectoriesEntry for each include, and that causes unnecessary and confusing splitting in the output when debugging the INCLUDE_DIRECTORIES property.
This commit is contained in:
parent
5e572619c6
commit
0d46e9a029
|
@ -37,9 +37,13 @@ bool cmFLTKWrapUICommand
|
|||
// get the list of GUI files from which .cxx and .h will be generated
|
||||
std::string outputDirectory = this->Makefile->GetCurrentOutputDirectory();
|
||||
|
||||
{
|
||||
// Some of the generated files are *.h so the directory "GUI"
|
||||
// where they are created have to be added to the include path
|
||||
this->Makefile->AddIncludeDirectory( outputDirectory.c_str() );
|
||||
std::vector<std::string> outputDirectories;
|
||||
outputDirectories.push_back(outputDirectory);
|
||||
this->Makefile->AddIncludeDirectories( outputDirectories );
|
||||
}
|
||||
|
||||
for(std::vector<std::string>::iterator i = (newArgs.begin() + 1);
|
||||
i != newArgs.end(); i++)
|
||||
|
|
|
@ -36,6 +36,10 @@ bool cmIncludeDirectoryCommand
|
|||
++i;
|
||||
}
|
||||
|
||||
std::vector<std::string> beforeIncludes;
|
||||
std::vector<std::string> afterIncludes;
|
||||
std::set<cmStdString> systemIncludes;
|
||||
|
||||
for(; i != args.end(); ++i)
|
||||
{
|
||||
if(*i == "SYSTEM")
|
||||
|
@ -49,9 +53,37 @@ bool cmIncludeDirectoryCommand
|
|||
return false;
|
||||
}
|
||||
|
||||
this->AddDirectory(i->c_str(),before,system);
|
||||
std::vector<std::string> includes;
|
||||
|
||||
GetIncludes(*i, includes);
|
||||
|
||||
if (before)
|
||||
{
|
||||
beforeIncludes.insert(beforeIncludes.end(),
|
||||
includes.begin(),
|
||||
includes.end());
|
||||
}
|
||||
else
|
||||
{
|
||||
afterIncludes.insert(afterIncludes.end(),
|
||||
includes.begin(),
|
||||
includes.end());
|
||||
}
|
||||
if (system)
|
||||
{
|
||||
for (std::vector<std::string>::const_iterator li = includes.begin();
|
||||
li != includes.end(); ++li)
|
||||
{
|
||||
systemIncludes.insert(*li);
|
||||
}
|
||||
}
|
||||
}
|
||||
std::reverse(beforeIncludes.begin(), beforeIncludes.end());
|
||||
|
||||
this->Makefile->AddIncludeDirectories(afterIncludes);
|
||||
this->Makefile->AddIncludeDirectories(beforeIncludes, before);
|
||||
this->Makefile->AddSystemIncludeDirectories(systemIncludes);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
@ -72,57 +104,49 @@ static bool StartsWithGeneratorExpression(const std::string &input)
|
|||
// output from a program and passing it into a command the cleanup doesn't
|
||||
// always happen
|
||||
//
|
||||
void cmIncludeDirectoryCommand::AddDirectory(const char *i,
|
||||
bool before,
|
||||
bool system)
|
||||
void cmIncludeDirectoryCommand::GetIncludes(const std::string &arg,
|
||||
std::vector<std::string> &incs)
|
||||
{
|
||||
// break apart any line feed arguments
|
||||
std::string ret = i;
|
||||
std::string::size_type pos = 0;
|
||||
if((pos = ret.find('\n', pos)) != std::string::npos)
|
||||
std::string::size_type lastPos = 0;
|
||||
while((pos = arg.find('\n', lastPos)) != std::string::npos)
|
||||
{
|
||||
if (pos)
|
||||
{
|
||||
this->AddDirectory(ret.substr(0,pos).c_str(), before, system);
|
||||
std::string inc = arg.substr(lastPos,pos);
|
||||
NormalizeInclude(inc);
|
||||
incs.push_back(inc);
|
||||
}
|
||||
if (ret.size()-pos-1)
|
||||
{
|
||||
this->AddDirectory(ret.substr(pos+1,ret.size()-pos-1).c_str(),
|
||||
before, system);
|
||||
}
|
||||
return;
|
||||
lastPos = pos + 1;
|
||||
}
|
||||
std::string inc = arg.substr(lastPos);
|
||||
NormalizeInclude(inc);
|
||||
incs.push_back(inc);
|
||||
}
|
||||
|
||||
void cmIncludeDirectoryCommand::NormalizeInclude(std::string &inc)
|
||||
{
|
||||
std::string::size_type b = inc.find_first_not_of(" \r");
|
||||
std::string::size_type e = inc.find_last_not_of(" \r");
|
||||
if ((b!=inc.npos) && (e!=inc.npos))
|
||||
{
|
||||
inc.assign(inc, b, 1+e-b); // copy the remaining substring
|
||||
}
|
||||
|
||||
// remove any leading or trailing spaces and \r
|
||||
std::string::size_type b = ret.find_first_not_of(" \r");
|
||||
std::string::size_type e = ret.find_last_not_of(" \r");
|
||||
if ((b!=ret.npos) && (e!=ret.npos))
|
||||
if (!cmSystemTools::IsOff(inc.c_str()))
|
||||
{
|
||||
ret.assign(ret, b, 1+e-b); // copy the remaining substring
|
||||
}
|
||||
else
|
||||
{
|
||||
return; // if we get here, we had only whitespace in the string
|
||||
}
|
||||
cmSystemTools::ConvertToUnixSlashes(inc);
|
||||
|
||||
if (!cmSystemTools::IsOff(ret.c_str()))
|
||||
{
|
||||
cmSystemTools::ConvertToUnixSlashes(ret);
|
||||
if(!cmSystemTools::FileIsFullPath(ret.c_str()))
|
||||
if(!cmSystemTools::FileIsFullPath(inc.c_str()))
|
||||
{
|
||||
if(!StartsWithGeneratorExpression(ret))
|
||||
if(!StartsWithGeneratorExpression(inc))
|
||||
{
|
||||
std::string tmp = this->Makefile->GetStartDirectory();
|
||||
tmp += "/";
|
||||
tmp += ret;
|
||||
ret = tmp;
|
||||
tmp += inc;
|
||||
inc = tmp;
|
||||
}
|
||||
}
|
||||
}
|
||||
this->Makefile->AddIncludeDirectory(ret.c_str(), before);
|
||||
if(system)
|
||||
{
|
||||
this->Makefile->AddSystemIncludeDirectory(ret.c_str());
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -84,7 +84,8 @@ public:
|
|||
|
||||
protected:
|
||||
// used internally
|
||||
void AddDirectory(const char *arg, bool before, bool system);
|
||||
void GetIncludes(const std::string &arg, std::vector<std::string> &incs);
|
||||
void NormalizeInclude(std::string &inc);
|
||||
};
|
||||
|
||||
|
||||
|
|
|
@ -1616,20 +1616,31 @@ void cmMakefile::AddSubDirectory(const char* srcPath, const char *binPath,
|
|||
}
|
||||
|
||||
//----------------------------------------------------------------------------
|
||||
void cmMakefile::AddIncludeDirectory(const char* inc, bool before)
|
||||
void cmMakefile::AddIncludeDirectories(const std::vector<std::string> &incs,
|
||||
bool before)
|
||||
{
|
||||
if (!inc)
|
||||
if (incs.empty())
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
std::string incString;
|
||||
std::string sep;
|
||||
|
||||
for(std::vector<std::string>::const_iterator li = incs.begin();
|
||||
li != incs.end(); ++li)
|
||||
{
|
||||
incString += sep + *li;
|
||||
sep = ";";
|
||||
}
|
||||
|
||||
std::vector<IncludeDirectoriesEntry>::iterator position =
|
||||
before ? this->IncludeDirectoriesEntries.begin()
|
||||
: this->IncludeDirectoriesEntries.end();
|
||||
before ? this->IncludeDirectoriesEntries.begin()
|
||||
: this->IncludeDirectoriesEntries.end();
|
||||
|
||||
cmListFileBacktrace lfbt;
|
||||
this->GetBacktrace(lfbt);
|
||||
IncludeDirectoriesEntry entry(inc, lfbt);
|
||||
IncludeDirectoriesEntry entry(incString, lfbt);
|
||||
this->IncludeDirectoriesEntries.insert(position, entry);
|
||||
|
||||
// Property on each target:
|
||||
|
@ -1642,9 +1653,14 @@ void cmMakefile::AddIncludeDirectory(const char* inc, bool before)
|
|||
}
|
||||
|
||||
//----------------------------------------------------------------------------
|
||||
void cmMakefile::AddSystemIncludeDirectory(const char* dir)
|
||||
void
|
||||
cmMakefile::AddSystemIncludeDirectories(const std::set<cmStdString> &incs)
|
||||
{
|
||||
this->SystemIncludeDirectories.insert(dir);
|
||||
for(std::set<cmStdString>::const_iterator li = incs.begin();
|
||||
li != incs.end(); ++li)
|
||||
{
|
||||
this->SystemIncludeDirectories.insert(*li);
|
||||
}
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------------------
|
||||
|
|
|
@ -287,7 +287,8 @@ public:
|
|||
/**
|
||||
* Add an include directory to the build.
|
||||
*/
|
||||
void AddIncludeDirectory(const char*, bool before = false);
|
||||
void AddIncludeDirectories(const std::vector<std::string> &incs,
|
||||
bool before = false);
|
||||
|
||||
/**
|
||||
* Add a variable definition to the build. This variable
|
||||
|
@ -545,7 +546,7 @@ public:
|
|||
/**
|
||||
* Mark include directories as system directories.
|
||||
*/
|
||||
void AddSystemIncludeDirectory(const char* dir);
|
||||
void AddSystemIncludeDirectories(const std::set<cmStdString> &incs);
|
||||
bool IsSystemIncludeDirectory(const char* dir);
|
||||
|
||||
/** Expand out any arguements in the vector that have ; separated
|
||||
|
|
|
@ -2,13 +2,6 @@ CMake Warning at DebugIncludes.cmake:8 \(include_directories\):
|
|||
Used includes:
|
||||
|
||||
\* .*/Tests/RunCMake/include_directories/one
|
||||
|
||||
Call Stack \(most recent call first\):
|
||||
CMakeLists.txt:3 \(include\)
|
||||
+
|
||||
CMake Warning at DebugIncludes.cmake:8 \(include_directories\):
|
||||
Used includes:
|
||||
|
||||
\* .*/Tests/RunCMake/include_directories/two
|
||||
|
||||
Call Stack \(most recent call first\):
|
||||
|
|
Loading…
Reference in New Issue