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

makefile now ignores NOTFOUND libs and includes

This commit is contained in:
Ken Martin 2002-07-25 08:00:03 -04:00
parent 6707a2b736
commit 8a3b2ad92e
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Source/cmMakefile.cxx
View File

@ -493,6 +493,11 @@ void cmMakefile::AddDefineFlag(const char* flag)
void cmMakefile::AddLinkLibrary(const char* lib, cmTarget::LinkLibraryType llt) void cmMakefile::AddLinkLibrary(const char* lib, cmTarget::LinkLibraryType llt)
{ {
// if it is NOTFOUND then skip it
if (!strcmp(lib,"NOTFOUND"))
{
return;
}
m_LinkLibraries.push_back( m_LinkLibraries.push_back(
std::pair<std::string, cmTarget::LinkLibraryType>(lib,llt)); std::pair<std::string, cmTarget::LinkLibraryType>(lib,llt));
} }
@ -501,6 +506,12 @@ void cmMakefile::AddLinkLibraryForTarget(const char *target,
const char* lib, const char* lib,
cmTarget::LinkLibraryType llt) cmTarget::LinkLibraryType llt)
{ {
// if it is NOTFOUND then skip it
if (!strcmp(lib,"NOTFOUND"))
{
return;
}
cmTargets::iterator i = m_Targets.find(target); cmTargets::iterator i = m_Targets.find(target);
if ( i != m_Targets.end()) if ( i != m_Targets.end())
{ {
@ -567,6 +578,12 @@ void cmMakefile::AddSubDirectory(const char* sub)
void cmMakefile::AddIncludeDirectory(const char* inc, bool before) void cmMakefile::AddIncludeDirectory(const char* inc, bool before)
{ {
// if it is NOTFOUND then skip it
if (!strcmp(inc,"NOTFOUND"))
{
return;
}
// Don't add an include directory that is already present. Yes, // Don't add an include directory that is already present. Yes,
// this linear search results in n^2 behavior, but n won't be // this linear search results in n^2 behavior, but n won't be
// getting much bigger than 20. We cannot use a set because of // getting much bigger than 20. We cannot use a set because of