Skip to content

ENH: Enable AutoInit for LayerDM #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Thibault-Pelletier merged 1 commit into from
Dec 8, 2025
Merged

ENH: Enable AutoInit for LayerDM #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions LayerDM/MRMLDM/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ set(${KIT}_TARGET_LIBRARIES
)

#-----------------------------------------------------------------------------

SlicerMacroBuildModuleLogic(
NAME ${KIT}
EXPORT_DIRECTIVE ${${KIT}_EXPORT_DIRECTIVE}
Expand All @@ -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)
24 changes: 24 additions & 0 deletions LayerDM/MRMLDM/vtkSlicerLayerDMModuleMRMLDisplayableManagerExport.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
4 changes: 0 additions & 4 deletions LayerDM/qSlicerLayerDMModule.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,6 @@

#include "vtkMRMLLayerDisplayableManager.h"

#include <vtkAutoInit.h>

VTK_MODULE_INIT(vtkSlicerLayerDMModuleMRMLDisplayableManager);

//-----------------------------------------------------------------------------
qSlicerLayerDMModule::qSlicerLayerDMModule(QObject* _parent)
: Superclass(_parent)
Expand Down