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

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)
This commit is contained in:
John Biddiscombe 2001-10-02 23:10:46 -04:00
parent 8591786867
commit 668c929647
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Source/cmBorlandMakefileGenerator.cpp
View File

@ -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
{