Updates to tmsi plugin and win plugin deployment

mne-tools · Aug 8, 2023 · f473f23 · f473f23
1 parent ccb2a89
commit f473f23
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 4 deletions.
diff --git a/src/applications/mne_analyze/plugins/CMakeLists.txt b/src/applications/mne_analyze/plugins/CMakeLists.txt
@@ -11,6 +11,11 @@ if(WIN32)
   set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_DEBUG ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY})
 endif()
 
+if(WIN32)
+  set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/mne_scan_plugins)
+  set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/mne_scan_plugins)
+endif()
+
 set(CMAKE_SHARED_LIBRARY_PREFIX "")
 set(CMAKE_STATIC_LIBRARY_PREFIX "")
 

diff --git a/src/applications/mne_rt_server/plugins/CMakeLists.txt b/src/applications/mne_rt_server/plugins/CMakeLists.txt
@@ -9,6 +9,11 @@ if(WIN32)
   set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_DEBUG ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY})
 endif()
 
+if(WIN32)
+  set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/mne_scan_plugins)
+  set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/mne_scan_plugins)
+endif()
+
 set(CMAKE_SHARED_LIBRARY_PREFIX "")
 set(CMAKE_STATIC_LIBRARY_PREFIX "")
 

diff --git a/src/applications/mne_scan/plugins/CMakeLists.txt b/src/applications/mne_scan/plugins/CMakeLists.txt
@@ -9,6 +9,11 @@ if(WIN32)
   set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_DEBUG ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY})
 endif()
 
+if(WIN32)
+  set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/mne_scan_plugins)
+  set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/mne_scan_plugins)
+endif()
+
 set(CMAKE_SHARED_LIBRARY_PREFIX "")
 set(CMAKE_STATIC_LIBRARY_PREFIX "")
 

diff --git a/src/applications/mne_scan/plugins/tmsi/CMakeLists.txt b/src/applications/mne_scan/plugins/tmsi/CMakeLists.txt
@@ -40,7 +40,7 @@ set(HEADERS
 
 set(UI
     FormFiles/tmsisetup.ui
-    FormFiles/tmsimanualannotationwidget.ui
+    FormFiles/tmsimanualannotation.ui
     FormFiles/tmsiimpedancewidget.ui
     FormFiles/tmsisetupprojectwidget.ui
 )
@@ -74,6 +74,7 @@ if(USE_FFTW)
 endif()
 
 target_include_directories(${PROJECT_NAME} PUBLIC ../)
+target_include_directories(${PROJECT_NAME} PRIVATE .)
 
 set(QT_REQUIRED_COMPONENT_LIBS ${QT_REQUIRED_COMPONENTS})
 list(TRANSFORM QT_REQUIRED_COMPONENT_LIBS PREPEND "Qt${QT_VERSION_MAJOR}::")

diff --git a/src/applications/mne_scan/plugins/tmsi/tmsi_global.h b/src/applications/mne_scan/plugins/tmsi/tmsi_global.h
@@ -52,7 +52,7 @@
 // PREPROCESSOR DEFINES
 //=============================================================================================================
 
-#if defined(TMSI_LIBRARY)
+#if defined(SCAN_TMSI_PLUGIN)
 #  define TMSISHARED_EXPORT Q_DECL_EXPORT   /**< Q_DECL_EXPORT must be added to the declarations of symbols used when compiling a shared library. */
 #else
 #  define TMSISHARED_EXPORT Q_DECL_IMPORT   /**< Q_DECL_IMPORT must be added to the declarations of symbols used when compiling a client that uses the shared library. */

diff --git a/src/applications/mne_scan/plugins/tmsi/tmsiimpedancescene.h b/src/applications/mne_scan/plugins/tmsi/tmsiimpedancescene.h
@@ -39,7 +39,7 @@
 //=============================================================================================================
 // INCLUDES
 //=============================================================================================================
-#include <tmsielectrodeitem.h>
+#include "tmsielectrodeitem.h"
 
 //=============================================================================================================
 // QT INCLUDES

diff --git a/src/applications/mne_scan/plugins/tmsi/tmsiimpedanceview.h b/src/applications/mne_scan/plugins/tmsi/tmsiimpedanceview.h
@@ -40,7 +40,7 @@
 // INCLUDES
 //=============================================================================================================
 #include <iostream>
-#include <tmsielectrodeitem.h>
+#include "tmsielectrodeitem.h"
 
 //=============================================================================================================
 // QT INCLUDES