| @@ -33,7 +33,8 | |||
|
|
33 | 33 | |
|
|
34 | 34 | Q_LOGGING_CATEGORY(LOG_Main, "Main") |
|
|
35 | 35 | |
|
|
36 |
namespace |
|
|
|
36 | namespace | |
|
|
37 | { | |
|
|
37 | 38 | |
|
|
38 | 39 | const auto PLUGIN_DIRECTORY_NAME = QStringLiteral("plugins"); |
|
|
39 | 40 | |
| @@ -63,13 +64,10 int main(int argc, char *argv[]) | |||
|
|
63 | 64 | // Loads plugins |
|
|
64 | 65 | auto pluginDir = QDir{a.applicationDirPath()}; |
|
|
65 | 66 | auto pluginLookupPath = { |
|
|
66 | a.applicationDirPath(), | |
|
|
67 | a.applicationDirPath() + "/" + PLUGIN_DIRECTORY_NAME, | |
|
|
68 | 67 | a.applicationDirPath() + "/../lib64/SciQlop", |
|
|
69 | 68 | a.applicationDirPath() + "/../lib64/sciqlop", |
|
|
70 | 69 | a.applicationDirPath() + "/../lib/SciQlop", |
|
|
71 | 70 | a.applicationDirPath() + "/../lib/sciqlop", |
|
|
72 | a.applicationDirPath() + "/../plugins", | |
|
|
73 | 71 | }; |
|
|
74 | 72 | |
|
|
75 | 73 | #if _WIN32 || _WIN64 |
| @@ -79,9 +77,11 int main(int argc, char *argv[]) | |||
|
|
79 | 77 | |
|
|
80 | 78 | PluginManager pluginManager{}; |
|
|
81 | 79 | |
|
|
82 |
for (auto |
|
|
|
80 | for (auto&& path : pluginLookupPath) | |
|
|
81 | { | |
|
|
83 | 82 | QDir directory{path}; |
|
|
84 |
if (directory.exists()) |
|
|
|
83 | if (directory.exists()) | |
|
|
84 | { | |
|
|
85 | 85 | qCDebug(LOG_Main()) |
|
|
86 | 86 | << QObject::tr("Plugin directory: %1").arg(directory.absolutePath()); |
|
|
87 | 87 | pluginManager.loadPlugins(directory); |
| @@ -30,7 +30,7 target_link_libraries(amdaplugin PUBLIC sciqlopgui) | |||
|
|
30 | 30 | install(TARGETS amdaplugin |
|
|
31 | 31 | ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/SciQlop |
|
|
32 | 32 | LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/SciQlop |
|
|
33 | RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) | |
|
|
33 | RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}/SciQlop) | |
|
|
34 | 34 | |
|
|
35 | 35 | include(sciqlop_tests) |
|
|
36 | 36 | |
| @@ -19,7 +19,7 target_link_libraries(mockplugin sciqlopgui) | |||
|
|
19 | 19 | install(TARGETS mockplugin |
|
|
20 | 20 | ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/SciQlop |
|
|
21 | 21 | LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/SciQlop |
|
|
22 | RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) | |
|
|
22 | RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}/SciQlop) | |
|
|
23 | 23 | |
|
|
24 | 24 | include(sciqlop_tests) |
|
|
25 | 25 | |
General Comments 0
You need to be logged in to leave comments.
Login now