diff options
author | Ken Martin <ken.martin@kitware.com> | 2002-07-25 12:00:03 (GMT) |
---|---|---|
committer | Ken Martin <ken.martin@kitware.com> | 2002-07-25 12:00:03 (GMT) |
commit | 8a3b2ad92ed891db8794fd59596de0337d6008ca (patch) | |
tree | 3be0c21000fb4456e608bf6d98a76d651fe028a2 | |
parent | 6707a2b73670c23eef367b9408aef688e2e1a004 (diff) | |
download | CMake-8a3b2ad92ed891db8794fd59596de0337d6008ca.zip CMake-8a3b2ad92ed891db8794fd59596de0337d6008ca.tar.gz CMake-8a3b2ad92ed891db8794fd59596de0337d6008ca.tar.bz2 |
makefile now ignores NOTFOUND libs and includes
-rw-r--r-- | Source/cmMakefile.cxx | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 75dd641..c45c81f 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -493,6 +493,11 @@ void cmMakefile::AddDefineFlag(const char* flag) 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( std::pair<std::string, cmTarget::LinkLibraryType>(lib,llt)); } @@ -501,6 +506,12 @@ void cmMakefile::AddLinkLibraryForTarget(const char *target, const char* lib, cmTarget::LinkLibraryType llt) { + // if it is NOTFOUND then skip it + if (!strcmp(lib,"NOTFOUND")) + { + return; + } + cmTargets::iterator i = m_Targets.find(target); if ( i != m_Targets.end()) { @@ -567,6 +578,12 @@ void cmMakefile::AddSubDirectory(const char* sub) 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, // 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 |