Commit 3745beae by Maarten L. Hekkelman

Fix search order for resources

parent 3965840b
...@@ -1260,19 +1260,19 @@ class ResourcePool ...@@ -1260,19 +1260,19 @@ class ResourcePool
ResourcePool::ResourcePool() ResourcePool::ResourcePool()
{ {
pushDir(getenv("LIBCIFPP_DATA_DIR"));
#if defined(DATA_DIR) #if defined(DATA_DIR)
pushDir(DATA_DIR); pushDir(DATA_DIR);
#endif #endif
#if defined(CACHE_DIR) pushDir(getenv("LIBCIFPP_DATA_DIR"));
pushDir(CACHE_DIR);
#endif
auto ccp4 = getenv("CCP4"); auto ccp4 = getenv("CCP4");
if (ccp4 != nullptr) if (ccp4 != nullptr)
pushDir(fs::path(ccp4) / "share" / "libcifpp"); pushDir(fs::path(ccp4) / "share" / "libcifpp");
#if defined(CACHE_DIR)
pushDir(CACHE_DIR);
#endif
} }
std::unique_ptr<std::istream> ResourcePool::load(fs::path name) std::unique_ptr<std::istream> ResourcePool::load(fs::path name)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment