Skip to content

Commit

Permalink
Merge pull request #9077 from NREL/PluginProgramPathIssue
Browse files Browse the repository at this point in the history
Use specified program root for API usage
  • Loading branch information
Myoldmopar authored Sep 20, 2021
2 parents 6a546e5 + c87cdd5 commit 414701c
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions src/EnergyPlus/PluginManager.cc
Original file line number Diff line number Diff line change
Expand Up @@ -406,8 +406,12 @@ PluginManager::PluginManager(EnergyPlusData &state)
{
#if LINK_WITH_PYTHON == 1
// we'll need the program directory for a few things so get it once here at the top and sanitize it
fs::path programPath = FileSystem::getAbsolutePath(FileSystem::getProgramPath());
fs::path programDir = FileSystem::getParentDirectoryPath(programPath);
fs::path programDir;
if (state.dataGlobal->installRootOverride) {
programDir = state.dataStrGlobals->exeDirectoryPath;
} else {
programDir = FileSystem::getParentDirectoryPath(FileSystem::getAbsolutePath(FileSystem::getProgramPath()));
}
fs::path sanitizedProgramDir = PluginManager::sanitizedPath(programDir);

// I think we need to set the python path before initializing the library
Expand Down

5 comments on commit 414701c

@nrel-bot-2
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

develop (Myoldmopar) - x86_64-Linux-Ubuntu-18.04-gcc-7.5: OK (2465 of 2465 tests passed, 0 test warnings)

Build Badge Test Badge

@nrel-bot-2
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

develop (Myoldmopar) - x86_64-Linux-Ubuntu-18.04-gcc-7.5-UnitTestsCoverage-Debug: OK (1710 of 1710 tests passed, 0 test warnings)

Build Badge Test Badge Coverage Badge

@nrel-bot
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

develop (Myoldmopar) - Win64-Windows-10-VisualStudio-16: OK (2423 of 2423 tests passed, 0 test warnings)

Build Badge Test Badge

@nrel-bot-3
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

develop (Myoldmopar) - x86_64-MacOS-10.15-clang-11.0.0: OK (2444 of 2444 tests passed, 0 test warnings)

Build Badge Test Badge

@nrel-bot-2
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

develop (Myoldmopar) - x86_64-Linux-Ubuntu-18.04-gcc-7.5-IntegrationCoverage-Debug: OK (737 of 737 tests passed, 0 test warnings)

Build Badge Test Badge Coverage Badge

Please sign in to comment.