##// END OF EJS Templates
HG_REPOSITORIES » LPP » SciQLOP_Repos » SciQLop
RSS
Fixed wrong plugin path with windows...
jeandet -
r1401:332611cbdba3
parent child
Show More
Side by Side Unified
Context file:
r1401:332611cbdba3 Loading diff...:
Show file before | Show file after | Hide comments
@@ -64,10 +64,14 int main(int argc, char* argv[])
64 // Loads plugins
64 // Loads plugins
65 auto pluginDir = QDir { a.applicationDirPath() };
65 auto pluginDir = QDir { a.applicationDirPath() };
66 auto pluginLookupPath = {
66 auto pluginLookupPath = {
67 #if _WIN32 || _WIN64
68 a.applicationDirPath() + "/SciQLop"
69 #else
67 a.applicationDirPath() + "/../lib64/SciQLop",
70 a.applicationDirPath() + "/../lib64/SciQLop",
68 a.applicationDirPath() + "/../lib64/sciqlop",
71 a.applicationDirPath() + "/../lib64/sciqlop",
69 a.applicationDirPath() + "/../lib/SciQLop",
72 a.applicationDirPath() + "/../lib/SciQLop",
70 a.applicationDirPath() + "/../lib/sciqlop",
73 a.applicationDirPath() + "/../lib/sciqlop",
74 #endif
71 };
75 };
72
76
73 #if _WIN32 || _WIN64
77 #if _WIN32 || _WIN64
Show file before | Show file after | Hide comments
@@ -28,9 +28,9 SET_TARGET_PROPERTIES(amdaplugin PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE)
28 target_link_libraries(amdaplugin PUBLIC sciqlopgui)
28 target_link_libraries(amdaplugin PUBLIC sciqlopgui)
29
29
30 install(TARGETS amdaplugin
30 install(TARGETS amdaplugin
31 ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/SciQlop
31 ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/SciQLop
32 LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/SciQlop
32 LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/SciQLop
33 RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}/SciQlop)
33 RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}/SciQLop)
34
34
35 include(sciqlop_tests)
35 include(sciqlop_tests)
36
36
Show file before | Show file after | Hide comments
@@ -17,9 +17,9 SET_TARGET_PROPERTIES(mockplugin PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE)
17 target_link_libraries(mockplugin sciqlopgui)
17 target_link_libraries(mockplugin sciqlopgui)
18
18
19 install(TARGETS mockplugin
19 install(TARGETS mockplugin
20 ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/SciQlop
20 ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/SciQLop
21 LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/SciQlop
21 LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/SciQLop
22 RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}/SciQlop)
22 RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}/SciQLop)
23
23
24 include(sciqlop_tests)
24 include(sciqlop_tests)
25
25
General Comments 0
You need to be logged in to leave comments. Login now