UnModulizePlgs : MEDReader

diff --git a/src/Plugins/MEDReader/CMakeLists.txt b/src/Plugins/MEDReader/CMakeLists.txt
index dc5e54b819869d7e7172942d780b8d940baefe71..39420aa16bfa1f53153beca00748ff3547a9c2d8 100644 (file)
--- a/src/Plugins/MEDReader/CMakeLists.txt
+++ b/src/Plugins/MEDReader/CMakeLists.txt
@@ -118,14 +118,25 @@ SALOME_ACCUMULATE_ENVIRONMENT(PV_PLUGIN_PATH NOCHECK ${CMAKE_INSTALL_PREFIX}/lib
 SET(VTK_INSTALL_RUNTIME_DIR lib/salome)
 SET(VTK_INSTALL_LIBRARY_DIR lib/salome)
 SET(VTK_INSTALL_ARCHIVE_DIR lib/salome)
-INCLUDE_DIRECTORIES(${MEDFILE_INCLUDE_DIRS} ${MEDCOUPLING_INCLUDE_DIRS} ${HDF5_INCLUDE_DIRS})
 PV_PROCESS_MODULES()
 
+INCLUDE_DIRECTORIES(
+  ${MEDCOUPLING_INCLUDE_DIRS}
+  ${MEDFILE_INCLUDE_DIRS}
+  ${HDF5_INCLUDE_DIRS}
+  ${MED_ROOT_DIR}/include/salome
+  )
+
+IF(HDF5_IS_PARALLEL)
+  ADD_DEFINITIONS("-DMEDREADER_USE_MPI")
+ENDIF(HDF5_IS_PARALLEL)
+
 #
 # Build the parallel vtkPMEDReader
 #
 SET(MEDReader_BUILD_PARALLEL ${VTK_USE_PARALLEL} CACHE BOOL "Build the Med Reader with parallel support.")
 
+ADD_SUBDIRECTORY(IO)
 #
 # Build the ParaView Plugin
 #

diff --git a/src/Plugins/MEDReader/IO/CMakeLists.txt b/src/Plugins/MEDReader/IO/CMakeLists.txt
index ba92fa88420b8e4fa8d2165737ad7e3cd498b958..a6b797230b110b53fd883b3f09105b61991cebcb 100644 (file)
--- a/src/Plugins/MEDReader/IO/CMakeLists.txt
+++ b/src/Plugins/MEDReader/IO/CMakeLists.txt
@@ -17,17 +17,6 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-INCLUDE_DIRECTORIES(
-  ${MEDCOUPLING_INCLUDE_DIRS}
-  ${MEDFILE_INCLUDE_DIRS}
-  ${HDF5_INCLUDE_DIRS}
-  ${MED_ROOT_DIR}/include/salome
-  )
-
-IF(HDF5_IS_PARALLEL)
-  ADD_DEFINITIONS("-DMEDREADER_USE_MPI")
-ENDIF(HDF5_IS_PARALLEL)
-
 SET(MEDReader_CLASSES vtkMEDReader vtkExtractGroup vtkELNOMeshFilter vtkELNOSurfaceFilter vtkELNOFilter 
                                    vtkExtractCellType vtkMEDQuadraturePointsGenerator)
 
@@ -49,11 +38,8 @@ ELSE(HDF5_IS_PARALLEL)
   TARGET_LINK_LIBRARIES(MEDLoaderForPV vtkCommonCore vtkCommonDataModel ${MEDCoupling_medloader} ${MEDFILE_C_LIBRARIES})
 ENDIF(HDF5_IS_PARALLEL)
 
-VTK_MODULE_LIBRARY(vtkMEDReader ${MEDReader_SRCS})
-TARGET_LINK_LIBRARIES(vtkMEDReader vtkPVVTKExtensionsRendering vtkFiltersGeneral vtkFiltersCore ${PARAVIEW_LIBRARIES} MEDLoaderForPV ${MEDFILE_C_LIBRARIES})
-
 INSTALL(
-  TARGETS vtkMEDReader MEDLoaderForPV
+  TARGETS MEDLoaderForPV
   RUNTIME DESTINATION lib/salome
   LIBRARY DESTINATION lib/salome
   ARCHIVE DESTINATION lib/salome

diff --git a/src/Plugins/MEDReader/IO/module.cmake b/src/Plugins/MEDReader/IO/module.cmake
deleted file mode 100644 (file)
index db6245d..0000000
--- a/src/Plugins/MEDReader/IO/module.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-SET(VTK_LIBS vtkCommonExecutionModel vtkParallelCore)
-
-vtk_module(vtkMEDReader
-  DEPENDS
-    ${VTK_LIBS}
-  TEST_DEPENDS
-    vtkRenderingCore
-    vtkTestingRendering
-    vtkInteractionStyle
-)

diff --git a/src/Plugins/MEDReader/ParaViewPlugin/CMakeLists.txt b/src/Plugins/MEDReader/ParaViewPlugin/CMakeLists.txt
index 2f948dad75db6acf42e22a0543caa5745238de39..21b87b1d0269b0fc3e32f09cefb130c563d49841 100644 (file)
--- a/src/Plugins/MEDReader/ParaViewPlugin/CMakeLists.txt
+++ b/src/Plugins/MEDReader/ParaViewPlugin/CMakeLists.txt
@@ -27,7 +27,15 @@ IF(PARAVIEW_BUILD_QT_GUI)
 
   # create a plugin that implements an object panel for the reader
   SET(SM_SRCS
-    vtkPVMetaDataInformation.cxx)
+    vtkPVMetaDataInformation.cxx
+    ${PROJECT_SOURCE_DIR}/IO/vtkMEDReader.cxx
+    ${PROJECT_SOURCE_DIR}/IO/vtkExtractGroup.cxx
+    ${PROJECT_SOURCE_DIR}/IO/vtkELNOMeshFilter.cxx
+    ${PROJECT_SOURCE_DIR}/IO/vtkELNOSurfaceFilter.cxx
+    ${PROJECT_SOURCE_DIR}/IO/vtkELNOFilter.cxx
+    ${PROJECT_SOURCE_DIR}/IO/vtkExtractCellType.cxx
+    ${PROJECT_SOURCE_DIR}/IO/vtkMEDQuadraturePointsGenerator.cxx
+    )
 
   SET(CLIENT_SRCS
     pqExtractGroupFieldsWidget.cxx
@@ -98,10 +106,6 @@ IF(PARAVIEW_BUILD_QT_GUI)
       ${MEDREADER_FIELDS_IFACE_SRCS}
       ${MEDREADER_VECTORS_IFACE_SRCS}
       ${EXTRACTGROUP_FIELDS_IFACES_SRCS}
-    CS_KITS
-    # this is the same name as the name in module.cmake file IO
-    # directory.
-    vtkMEDReader
     )
 
 ELSE(PARAVIEW_BUILD_QT_GUI)
@@ -118,7 +122,8 @@ ELSE(PARAVIEW_BUILD_QT_GUI)
 
 ENDIF(PARAVIEW_BUILD_QT_GUI)
 
-TARGET_LINK_LIBRARIES(MEDReaderPlugin vtkMEDReader vtkMEDReaderCS)
+TARGET_LINK_LIBRARIES(MEDReaderPlugin MEDLoaderForPV)
+
 # Install
 INSTALL(
   TARGETS MEDReaderPlugin