Merge pull request #2 from RafaelPalomar/enh/LayerDM_AutoInit

ENH: Enable AutoInit for LayerDM

Author: Thibault-Pelletier

LayerDM/MRMLDM/CMakeLists.txt

@@ -64,6 +64,7 @@ set(${KIT}_TARGET_LIBRARIES
 )
 
 #-----------------------------------------------------------------------------
+
 SlicerMacroBuildModuleLogic(
   NAME ${KIT}
   EXPORT_DIRECTIVE ${${KIT}_EXPORT_DIRECTIVE}
@@ -79,4 +80,11 @@ target_include_directories(
   ${${KIT}_BINARY_DIR}
 )
 
+if(${KIT}_AUTOINIT)
+  set_property(TARGET ${KIT}
+    APPEND PROPERTY COMPILE_DEFINITIONS
+    "${KIT}_AUTOINIT=1(${KIT})"
+    )
+endif()
+
 target_compile_features(${KIT} PUBLIC cxx_std_17)

LayerDM/MRMLDM/vtkSlicerLayerDMModuleMRMLDisplayableManagerExport.h

@@ -0,0 +1,24 @@
+///  vtkSlicerLayerDMModuleMRMLDisplayableManagerExport
+///
+/// The vtkSlicerLayerDMModuleMRMLDisplayableManagerExport captures some system differences between Unix
+/// and Windows operating systems, and enables auto init for the VTK module.
+
+#ifndef __vtkSlicerLayerDMModuleMRMLDisplayableManagerExport_h
+#define __vtkSlicerLayerDMModuleMRMLDisplayableManagerExport_h
+
+#if defined(_WIN32) && !defined(MRMLLayerDM_STATIC)
+# if defined(vtkSlicerLayerDMModuleMRMLDisplayableManager_EXPORTS)
+#  define VTK_SLICER_LAYERDM_MODULE_MRMLDISPLAYABLEMANAGER_EXPORT __declspec(dllexport)
+# else
+#  define VTK_SLICER_LAYERDM_MODULE_MRMLDISPLAYABLEMANAGER_EXPORT __declspec(dllimport)
+# endif
+#else
+# define VTK_SLICER_LAYERDM_MODULE_MRMLDISPLAYABLEMANAGER_EXPORT
+#endif
+
+#if defined(vtkSlicerLayerDMModuleMRMLDisplayableManager_AUTOINIT)
+# include <vtkAutoInit.h>
+VTK_AUTOINIT(vtkSlicerLayerDMModuleMRMLDisplayableManager)
+#endif
+
+#endif

LayerDM/qSlicerLayerDMModule.cxx

@@ -19,10 +19,6 @@
 
 #include "vtkMRMLLayerDisplayableManager.h"
 
-#include <vtkAutoInit.h>
-
-VTK_MODULE_INIT(vtkSlicerLayerDMModuleMRMLDisplayableManager);
-
 //-----------------------------------------------------------------------------
 qSlicerLayerDMModule::qSlicerLayerDMModule(QObject* _parent)
   : Superclass(_parent)