dynamicCode: Fixed handling of options and libs

This commit is contained in:
Will Bainbridge
2019-02-04 08:18:30 +00:00
parent b4a22214a1
commit 528dccc094
2 changed files with 22 additions and 1 deletions

View File

@ -332,7 +332,11 @@ void Foam::codedBase::updateLibrary
{
createLibrary(dynCode, context);
loadLibrary(libPath, dynCode.codeName(), context.dict());
if (!loadLibrary(libPath, dynCode.codeName(), context.dict()))
{
FatalIOErrorInFunction(context.dict())
<< "Failed to load " << libPath << exit(FatalIOError);
}
}
// retain for future reference

View File

@ -102,6 +102,23 @@ Foam::dynamicCodeContext::dynamicCodeContext
);
}
}
// Options
const entry* optionsPtr = dict.lookupEntryPtr("codeOptions", false, false);
if (optionsPtr)
{
options_ =
stringOps::expand(stringOps::trim(optionsPtr->stream()), dict);
}
// Libs
const entry* libsPtr = dict.lookupEntryPtr("codeLibs", false, false);
if (libsPtr)
{
libs_ =
stringOps::expand(stringOps::trim(libsPtr->stream()), dict);
}
}