mirror of
https://github.com/reactos/CMake.git
synced 2024-12-11 21:34:32 +00:00
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:
parent
8591786867
commit
668c929647
@ -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
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user