From 332611cbdba398d1829dcf94eb33862558cc8b42 2019-01-22 18:36:43
From: Alexis Jeandet <alexis.jeandet@member.fsf.org>
Date: 2019-01-22 18:36:43
Subject: [PATCH] Fixed wrong plugin path with windows

Signed-off-by: Alexis Jeandet <alexis.jeandet@member.fsf.org>

---

diff --git a/app/src/Main.cpp b/app/src/Main.cpp
index 83fd22a..85599d2 100644
--- a/app/src/Main.cpp
+++ b/app/src/Main.cpp
@@ -64,10 +64,14 @@ int main(int argc, char* argv[])
     // Loads plugins
     auto pluginDir = QDir { a.applicationDirPath() };
     auto pluginLookupPath = {
+#if _WIN32 || _WIN64
+        a.applicationDirPath() + "/SciQLop"
+#else
         a.applicationDirPath() + "/../lib64/SciQLop",
         a.applicationDirPath() + "/../lib64/sciqlop",
         a.applicationDirPath() + "/../lib/SciQLop",
         a.applicationDirPath() + "/../lib/sciqlop",
+#endif
     };
 
 #if _WIN32 || _WIN64
diff --git a/plugins/amda/CMakeLists.txt b/plugins/amda/CMakeLists.txt
index c943281..7b32b41 100644
--- a/plugins/amda/CMakeLists.txt
+++ b/plugins/amda/CMakeLists.txt
@@ -28,9 +28,9 @@ SET_TARGET_PROPERTIES(amdaplugin PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE)
 target_link_libraries(amdaplugin PUBLIC sciqlopgui)
 
 install(TARGETS amdaplugin
-    ARCHIVE  DESTINATION ${CMAKE_INSTALL_LIBDIR}/SciQlop
-    LIBRARY  DESTINATION ${CMAKE_INSTALL_LIBDIR}/SciQlop
-    RUNTIME  DESTINATION ${CMAKE_INSTALL_BINDIR}/SciQlop)
+    ARCHIVE  DESTINATION ${CMAKE_INSTALL_LIBDIR}/SciQLop
+    LIBRARY  DESTINATION ${CMAKE_INSTALL_LIBDIR}/SciQLop
+    RUNTIME  DESTINATION ${CMAKE_INSTALL_BINDIR}/SciQLop)
 
 include(sciqlop_tests)
 
diff --git a/plugins/mockplugin/CMakeLists.txt b/plugins/mockplugin/CMakeLists.txt
index 9f14859..faec8e8 100644
--- a/plugins/mockplugin/CMakeLists.txt
+++ b/plugins/mockplugin/CMakeLists.txt
@@ -17,9 +17,9 @@ SET_TARGET_PROPERTIES(mockplugin PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE)
 target_link_libraries(mockplugin sciqlopgui)
 
 install(TARGETS mockplugin
-    ARCHIVE  DESTINATION ${CMAKE_INSTALL_LIBDIR}/SciQlop
-    LIBRARY  DESTINATION ${CMAKE_INSTALL_LIBDIR}/SciQlop
-    RUNTIME  DESTINATION ${CMAKE_INSTALL_BINDIR}/SciQlop)
+    ARCHIVE  DESTINATION ${CMAKE_INSTALL_LIBDIR}/SciQLop
+    LIBRARY  DESTINATION ${CMAKE_INSTALL_LIBDIR}/SciQLop
+    RUNTIME  DESTINATION ${CMAKE_INSTALL_BINDIR}/SciQLop)
 
 include(sciqlop_tests)