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

Fix loading of module for borland

Browse Source
This commit is contained in:
Andy Cedilnik 2002-09-23 13:11:39 -04:00
parent 6a096be924
commit 5843ae455e
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Source/cmLoadCommandCommand.cxx
View File

@ -186,7 +186,7 @@ bool cmLoadCommandCommand::InitialPass(std::vector<std::string> const& argsIn)
this->SetError("Attempt to load command failed.");
return false;
}
// try loading the shared library / dll
cmLibHandle lib = cmDynamicLoader::OpenLibrary(fullPath.c_str());
if(lib)
@ -196,9 +196,21 @@ bool cmLoadCommandCommand::InitialPass(std::vector<std::string> const& argsIn)
CM_NAME_FUNCTION nameFunction
= (CM_NAME_FUNCTION)
cmDynamicLoader::GetSymbolAddress(lib, "cmGetName");
if ( !nameFunction )
{
nameFunction =
(CM_NAME_FUNCTION)(
cmDynamicLoader::GetSymbolAddress(lib, "_cmGetName"));
}
CM_INIT_FUNCTION initFunction
= (CM_INIT_FUNCTION)
cmDynamicLoader::GetSymbolAddress(lib, "cmInitializeCommand");
if ( !initFunction )
{
initFunction =
(CM_INIT_FUNCTION)(
cmDynamicLoader::GetSymbolAddress(lib, "_cmInitializeCommand"));
}
// if the symbol is found call it to set the name on the
// function blocker
if(nameFunction)
@ -208,13 +220,15 @@ bool cmLoadCommandCommand::InitialPass(std::vector<std::string> const& argsIn)
f->m_commandName = (*nameFunction)();
if (!initFunction)
{
this->SetError("Attempt to load command failed. No init function found.");
this->SetError("Attempt to load command failed. "
"No init function found.");
return false;
}
(*initFunction)(&f->info);
m_Makefile->AddCommand(f);
return true;
}
}
return true;
return false;
}