Dynamically search for the data/plugins directories

Search more dynamically for the Open Babel data/plugins directories, and warn if we cannot find them.
psavery · Sep 2, 2015 · 38a9fbb · 38a9fbb
1 parent fff9bf0
commit 38a9fbb
Showing 1 changed file with 22 additions and 7 deletions.
diff --git a/avogadro/qtplugins/openbabel/obprocess.cpp b/avogadro/qtplugins/openbabel/obprocess.cpp
@@ -54,13 +54,28 @@ OBProcess::OBProcess(QObject *parent_) :
       env.insert("BABEL_DATADIR",
                  QCoreApplication::applicationDirPath() + "/data");
 #else
-      // FIXME: Hardwiring a versioned subdirectory for now.
-      env.insert("BABEL_DATADIR",
-                 QCoreApplication::applicationDirPath()
-                 + "/../share/openbabel/2.3.2");
-      env.insert("BABEL_LIBDIR",
-                 QCoreApplication::applicationDirPath()
-                 + "/../lib/openbabel/2.3.2");
+      QDir dir(QCoreApplication::applicationDirPath() + "/../share/openbabel");
+      QStringList filters;
+      filters << "2.*";
+      QStringList dirs = dir.entryList(filters);
+      if (dirs.size() == 1) {
+        env.insert("BABEL_DATADIR",
+                   QCoreApplication::applicationDirPath()
+                   + "/../share/openbabel/" + dirs[0]);
+      }
+      else {
+        qDebug() << "Error, Open Babel data directory not found.";
+      }
+      dir.setPath(QCoreApplication::applicationDirPath() + "/../lib/openbabel");
+      dirs = dir.entryList(filters);
+      if (dirs.size() == 1) {
+        env.insert("BABEL_LIBDIR",
+                   QCoreApplication::applicationDirPath()
+                   + "/../lib/openbabel/" + dirs[0]);
+      }
+      else {
+        qDebug() << "Error, Open Babel plugins directory not found.";
+      }
 #endif
       m_process->setProcessEnvironment(env);
     }