diff --git a/Plugins/org.mitk.gui.qt.dicom/CMakeLists.txt b/Plugins/org.mitk.gui.qt.dicom/CMakeLists.txt index ab9c62e8f7..f19077c93f 100644 --- a/Plugins/org.mitk.gui.qt.dicom/CMakeLists.txt +++ b/Plugins/org.mitk.gui.qt.dicom/CMakeLists.txt @@ -1,17 +1,15 @@ project(org_mitk_gui_qt_dicom) set(QT_USE_QTSQL 1) -set(DCMTK_INSTALL_BIN ${DCMTK_DIR}/bin) include_directories(${CTK_INCLUDE_DIRS}) -find_program( VAR_STORESCP storescp PATH ${DCMTK_INSTALL_BIN}) -file(WRITE resources/config.txt ${VAR_STORESCP} ) +MITK_INSTALL(PROGRAMS ${VAR_STORESCP}) MACRO_CREATE_MITK_CTK_PLUGIN( EXPORT_DIRECTIVE DICOM_EXPORT EXPORTED_INCLUDE_SUFFIXES src MODULE_DEPENDENCIES QmitkExt mitkDicomUI ) target_link_libraries(${PLUGIN_TARGET} ${CTK_LIBRARIES}) diff --git a/Plugins/org.mitk.gui.qt.dicom/files.cmake b/Plugins/org.mitk.gui.qt.dicom/files.cmake index 6052e91fab..5aba8d5012 100644 --- a/Plugins/org.mitk.gui.qt.dicom/files.cmake +++ b/Plugins/org.mitk.gui.qt.dicom/files.cmake @@ -1,54 +1,53 @@ set(SRC_CPP_FILES ) set(INTERNAL_CPP_FILES mitkPluginActivator.cpp QmitkDicomEditor.cpp QmitkDicomDirectoryListener.cpp QmitkStoreSCPLauncher.cpp QmitkStoreSCPLauncherBuilder.cpp QmitkDicomDataEventPublisher.cpp DicomEventHandler.cpp #QmitkDicomPreferencePage.cpp ) set(UI_FILES src/internal/QmitkDicomEditorControls.ui ) set(MOC_H_FILES src/internal/mitkPluginActivator.h src/internal/QmitkDicomEditor.h src/internal/QmitkDicomDirectoryListener.h src/internal/QmitkStoreSCPLauncher.h src/internal/QmitkStoreSCPLauncherBuilder.h src/internal/QmitkDicomDataEventPublisher.h src/internal/DicomEventHandler.h #src/internal/QmitkDicomPreferencePage.h ) # list of resource files which can be used by the plug-in # system without loading the plug-ins shared library, # for example the icon used in the menu and tabs for the # plug-in views in the workbench set(CACHED_RESOURCE_FILES resources/icon.xpm plugin.xml ) # list of Qt .qrc files which contain additional resources # specific to this plugin set(QRC_FILES - resources/org_mitk_gui_qt_dicom.qrc ) set(CPP_FILES ) foreach(file ${SRC_CPP_FILES}) set(CPP_FILES ${CPP_FILES} src/${file}) endforeach(file ${SRC_CPP_FILES}) foreach(file ${INTERNAL_CPP_FILES}) set(CPP_FILES ${CPP_FILES} src/internal/${file}) endforeach(file ${INTERNAL_CPP_FILES}) diff --git a/Plugins/org.mitk.gui.qt.dicom/resources/config.txt b/Plugins/org.mitk.gui.qt.dicom/resources/config.txt deleted file mode 100644 index 738d39e414..0000000000 --- a/Plugins/org.mitk.gui.qt.dicom/resources/config.txt +++ /dev/null @@ -1 +0,0 @@ -C:/home/bauerm/bin/MITK/DCMTK-install/bin/storescp.exe \ No newline at end of file diff --git a/Plugins/org.mitk.gui.qt.dicom/resources/org_mitk_gui_qt_dicom.qrc b/Plugins/org.mitk.gui.qt.dicom/resources/org_mitk_gui_qt_dicom.qrc deleted file mode 100644 index 7792c50bbd..0000000000 --- a/Plugins/org.mitk.gui.qt.dicom/resources/org_mitk_gui_qt_dicom.qrc +++ /dev/null @@ -1,5 +0,0 @@ - - - config.txt - - \ No newline at end of file