summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Biddiscombe <jbiddiscombe@skippingmouse.co.uk>2001-10-02 23:10:46 -0400
committerJohn Biddiscombe <jbiddiscombe@skippingmouse.co.uk>2001-10-02 23:10:46 -0400
commit668c92964749c8fdc9520c76a115b542ff640d9f (patch)
tree703228e9f1d96b6472e31dbb619c1d2434853fab
parent8591786867111568298394242a80ddc0a321f5ad (diff)
downloadcmake-668c92964749c8fdc9520c76a115b542ff640d9f.tar.gz
FIX: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 ! (What this really means is the lib paths are correctly specified)
-rw-r--r--Source/cmBorlandMakefileGenerator.cpp17
1 files changed, 16 insertions, 1 deletions
diff --git a/Source/cmBorlandMakefileGenerator.cpp b/Source/cmBorlandMakefileGenerator.cpp
index 0511926210..e8af9c7245 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
{