From c9dd7827641272235df4fa4450b14e4678563c85 Mon Sep 17 00:00:00 2001
From: Jane Tournois <jane.tournois@geometryfactory.com>
Date: Thu, 19 Nov 2015 13:00:20 +0100
Subject: [PATCH 1/2] fix load of plugins for windows

needed because msvc creates the configuration (e.g. Debug) intermediate directory
For example, loader needs to find :
build/Plugins/IO/Debug/off_plugin.dll
build/Debug/demo_framework.dll
---
 Polyhedron/demo/Polyhedron/MainWindow.cpp | 38 ++++++++++++++++-------
 1 file changed, 27 insertions(+), 11 deletions(-)

diff --git a/Polyhedron/demo/Polyhedron/MainWindow.cpp b/Polyhedron/demo/Polyhedron/MainWindow.cpp
index b5339c95172..e6042b279a3 100644
--- a/Polyhedron/demo/Polyhedron/MainWindow.cpp
+++ b/Polyhedron/demo/Polyhedron/MainWindow.cpp
@@ -492,20 +492,36 @@ void MainWindow::loadPlugins()
   QList<QDir> plugins_directories;
   QString dirPath = qApp->applicationDirPath();
   plugins_directories<<dirPath;
-  Q_FOREACH( QString name, QDir(dirPath).entryList())
+
+  QDir msvc_dir(dirPath);
+  QString build_dir_name = msvc_dir.dirName();//Debug or Release for msvc
+  msvc_dir.cdUp();
+
+  QFileInfoList filist = QDir(dirPath).entryInfoList();
+  filist << msvc_dir.entryInfoList();
+
+  Q_FOREACH(QFileInfo fileinfo, filist)
   {
       //checks if the path leads to a directory
-      if(name.contains("Plugins"))
+      if(fileinfo.baseName().contains("Plugins"))
       {
-          QString path = dirPath;
-          path.append("/").append(name);
-              Q_FOREACH(QString sub_path, QDir(path).entryList())
-              {
-                  QString temp = path;
-                  temp.append("/").append(sub_path);
-                if(QDir(temp).exists())
-                  plugins_directories<<QDir(temp);
-                }
+        QString plugins_dir = fileinfo.absolutePath();
+        plugins_dir.append("/").append(fileinfo.baseName());
+
+        Q_FOREACH(QString package_dir,
+                  QDir(plugins_dir).entryList(QDir::Dirs))
+        {
+          QString package_dir_path(plugins_dir);
+          package_dir_path.append("/").append(package_dir);
+
+          QString libdir_path(package_dir_path);
+          libdir_path.append("/").append(build_dir_name);
+
+          if (QDir(libdir_path).exists())
+            plugins_directories << QDir(libdir_path);
+          else
+            plugins_directories << QDir(package_dir);
+        }
       }
   }
   QString env_path = qgetenv("POLYHEDRON_DEMO_PLUGINS_PATH");

From 98ff3fd8e5d229e48f287d8a43edebd63b611bcc Mon Sep 17 00:00:00 2001
From: Maxime Gimeno <maxime.gimeno@gmail.com>
Date: Thu, 19 Nov 2015 14:01:40 +0100
Subject: [PATCH 2/2] Bug linux fix

- changed package_dir into package_dir_path
---
 Polyhedron/demo/Polyhedron/MainWindow.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Polyhedron/demo/Polyhedron/MainWindow.cpp b/Polyhedron/demo/Polyhedron/MainWindow.cpp
index e6042b279a3..3ee83a7f9bd 100644
--- a/Polyhedron/demo/Polyhedron/MainWindow.cpp
+++ b/Polyhedron/demo/Polyhedron/MainWindow.cpp
@@ -520,7 +520,7 @@ void MainWindow::loadPlugins()
           if (QDir(libdir_path).exists())
             plugins_directories << QDir(libdir_path);
           else
-            plugins_directories << QDir(package_dir);
+            plugins_directories << QDir(package_dir_path);
         }
       }
   }