diff options
Diffstat (limited to 'Source/cmBorlandMakefileGenerator.cpp')
| -rw-r--r-- | Source/cmBorlandMakefileGenerator.cpp | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/Source/cmBorlandMakefileGenerator.cpp b/Source/cmBorlandMakefileGenerator.cpp index 0511926..e8af9c7 100644 --- a/Source/cmBorlandMakefileGenerator.cpp +++ b/Source/cmBorlandMakefileGenerator.cpp @@ -335,7 +335,22 @@ void cmBorlandMakefileGenerator::OutputMakefile(const char* file) if (tgts.find(l->first)==tgts.end()) { std::string path = cmSystemTools::FindFile(libname.c_str(),linkdirs); - if (path.size()) libname = path; + if (path.size()) + { + libname = path; + } + else + // if we can't find it - and it's not a target - and it has no path + // already specified, it must be in OUTDIRLIB from another + // makefile in the same project ! + { + std::string path = cmSystemTools::GetFilenamePath(libname); + if (path.size()==0) + { + libname = "$(OUTDIRLIB)\\" + libname; + } + // otherwise just leave it alone + } } else { |