UnModulizePlgs : MEDWriter

diff --git a/src/Plugins/MEDWriter/CMakeLists.txt b/src/Plugins/MEDWriter/CMakeLists.txt
index 0f3e72f401a436f949f27fac53705470e46e3da1..653e5cac29300c9bf468ebf0a457fc55d527af9a 100644 (file)
--- a/src/Plugins/MEDWriter/CMakeLists.txt
+++ b/src/Plugins/MEDWriter/CMakeLists.txt
@@ -54,6 +54,12 @@ FIND_PACKAGE(SalomeMEDFile REQUIRED)
 
 PV_PROCESS_MODULES()
 
+INCLUDE_DIRECTORIES(
+  ${MEDCOUPLING_INCLUDE_DIRS}
+  ${MEDFILE_INCLUDE_DIRS}
+  ${HDF5_INCLUDE_DIRS})
+
+ADD_SUBDIRECTORY(IO)
 ADD_SUBDIRECTORY(ParaViewPlugin)
 
 INCLUDE(CMakePackageConfigHelpers)

diff --git a/src/Plugins/MEDWriter/IO/CMakeLists.txt b/src/Plugins/MEDWriter/IO/CMakeLists.txt
index 2b8c2d9965e2e5147cfc6150f5b8f62e10e03dae..3add06800e5967fdd4831ced71cfabe6cb79ac3c 100644 (file)
--- a/src/Plugins/MEDWriter/IO/CMakeLists.txt
+++ b/src/Plugins/MEDWriter/IO/CMakeLists.txt
@@ -18,16 +18,8 @@
 #
 # Author : Anthony Geay (EDF R&D)
 
-INCLUDE_DIRECTORIES(
-  ${MEDCOUPLING_INCLUDE_DIRS}
-  ${MEDFILE_INCLUDE_DIRS}
-  ${HDF5_INCLUDE_DIRS})
-
 ADD_LIBRARY(VTKToMEDMem SHARED VTKToMEDMem.cxx)
 TARGET_LINK_LIBRARIES(VTKToMEDMem vtkPVVTKExtensionsRendering vtkFiltersGeneral vtkFiltersCore ${PARAVIEW_LIBRARIES} ${MEDCoupling_medloader} ${MEDFILE_C_LIBRARIES})
-VTK_MODULE_LIBRARY(vtkMEDWriter vtkMEDWriter.cxx)
-TARGET_LINK_LIBRARIES(vtkMEDWriter VTKToMEDMem)
-INSTALL(TARGETS vtkMEDWriter RUNTIME DESTINATION ${VTK_INSTALL_RUNTIME_DIR} LIBRARY DESTINATION ${VTK_INSTALL_LIBRARY_DIR} ARCHIVE DESTINATION ${VTK_INSTALL_ARCHIVE_DIR} )
 INSTALL(TARGETS VTKToMEDMem  EXPORT ${PROJECT_NAME}TargetGroup RUNTIME DESTINATION ${VTK_INSTALL_RUNTIME_DIR} LIBRARY DESTINATION ${VTK_INSTALL_LIBRARY_DIR} ARCHIVE DESTINATION ${VTK_INSTALL_ARCHIVE_DIR} )
 
 INSTALL(FILES VTKToMEDMem.hxx VTKMEDTraits.hxx DESTINATION ${MEDWRITER_INSTALL_HEADERS})

diff --git a/src/Plugins/MEDWriter/IO/module.cmake b/src/Plugins/MEDWriter/IO/module.cmake
deleted file mode 100644 (file)
index 1cd09c9..0000000
--- a/src/Plugins/MEDWriter/IO/module.cmake
+++ /dev/null
@@ -1,2 +0,0 @@
-SET(VTK_LIBS vtkCommonExecutionModel vtkParallelCore)
-VTK_MODULE(vtkMEDWriter DEPENDS ${VTK_LIBS})

diff --git a/src/Plugins/MEDWriter/ParaViewPlugin/CMakeLists.txt b/src/Plugins/MEDWriter/ParaViewPlugin/CMakeLists.txt
index d992788fcad4f07648778d2a3c6c0aed1e5f17cc..46c6f3eb7821d5febe3c58618b0b73989bf98028 100644 (file)
--- a/src/Plugins/MEDWriter/ParaViewPlugin/CMakeLists.txt
+++ b/src/Plugins/MEDWriter/ParaViewPlugin/CMakeLists.txt
@@ -20,9 +20,7 @@
 
 INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/../IO )
 ADD_PARAVIEW_PLUGIN(MEDWriterPlugin "4.0"
-  SERVER_MANAGER_SOURCES ${SM_SRCS}
-  SERVER_MANAGER_XML Resources/MEDWriterServer.xml
-  CS_KITS
-  vtkMEDWriter)
-TARGET_LINK_LIBRARIES(MEDWriterPlugin vtkMEDWriter vtkMEDWriterCS)
+  SERVER_MANAGER_SOURCES ${SM_SRCS} ${PROJECT_SOURCE_DIR}/IO/vtkMEDWriter.cxx
+  SERVER_MANAGER_XML Resources/MEDWriterServer.xml)
+TARGET_LINK_LIBRARIES(MEDWriterPlugin VTKToMEDMem)
 INSTALL(TARGETS MEDWriterPlugin RUNTIME DESTINATION lib/paraview LIBRARY DESTINATION lib/paraview ARCHIVE DESTINATION lib/paraview)