Merge branch 'agy/UnModulizePlgs'

diff --git a/src/Plugins/MEDReader/CMakeLists.txt b/src/Plugins/MEDReader/CMakeLists.txt
index dc5e54b819869d7e7172942d780b8d940baefe71..dd004c5c7a56de32e3ff85ff67dfcb3789b4de14 100644 (file)
--- a/src/Plugins/MEDReader/CMakeLists.txt
+++ b/src/Plugins/MEDReader/CMakeLists.txt
@@ -93,7 +93,6 @@ IF(MEDReader_BUILD_ParaView_Plugin)
     ENDIF(NOT ParaView_FOUND)
     INCLUDE(${PARAVIEW_USE_FILE})
     # Load information about VTK/ParaView modules loaded/available.
-    PV_SETUP_MODULE_ENVIRONMENT("vtkMEDReader")
 ELSE(MEDReader_BUILD_ParaView_Plugin)
     FIND_PACKAGE(VTK REQUIRED)
     if(NOT VTK_FOUND)
@@ -118,14 +117,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

diff --git a/src/Plugins/MEDWriter/CMakeLists.txt b/src/Plugins/MEDWriter/CMakeLists.txt
index 0f3e72f401a436f949f27fac53705470e46e3da1..edcbf67ac80a74837760e2cbdf45ed4b6eab461c 100644 (file)
--- a/src/Plugins/MEDWriter/CMakeLists.txt
+++ b/src/Plugins/MEDWriter/CMakeLists.txt
@@ -34,7 +34,6 @@ IF(NOT ParaView_FOUND)
   MESSAGE(FATAL_ERROR "Please locate ParaView." )
 ENDIF(NOT ParaView_FOUND)
 INCLUDE(${PARAVIEW_USE_FILE})
-PV_SETUP_MODULE_ENVIRONMENT("vtkMEDWriter")
 
 OPTION(BUILD_SHARED_LIBS "Build with shared libraries." ${VTK_BUILD_SHARED_LIBS})
 
@@ -54,6 +53,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)

diff --git a/src/Plugins/SimpleMode/CMakeLists.txt b/src/Plugins/SimpleMode/CMakeLists.txt
index a7e60eb5e7873cc708f063bbb6df91473e5c84e0..69fdb57a28451eea1dfad9bb7c4dbf1dc659402d 100644 (file)
--- a/src/Plugins/SimpleMode/CMakeLists.txt
+++ b/src/Plugins/SimpleMode/CMakeLists.txt
@@ -46,7 +46,6 @@ IF(NOT ParaView_FOUND)
   MESSAGE(FATAL_ERROR "Please locate ParaView." )
 ENDIF(NOT ParaView_FOUND)
 INCLUDE(${PARAVIEW_USE_FILE})
-PV_SETUP_MODULE_ENVIRONMENT("vtkSimpleMode")
 
 OPTION(BUILD_SHARED_LIBS "Build with shared libraries." ${VTK_BUILD_SHARED_LIBS})
 

diff --git a/src/Plugins/SimpleMode/IO/CMakeLists.txt b/src/Plugins/SimpleMode/IO/CMakeLists.txt
deleted file mode 100644 (file)
index 2bd884f..0000000
--- a/src/Plugins/SimpleMode/IO/CMakeLists.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright (C) 2017  CEA/DEN, EDF R&D
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-#
-# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-#
-# Author : Anthony Geay (EDF R&D)
-
-VTK_MODULE_LIBRARY(vtkSimpleMode vtkSimpleMode.cxx)
-TARGET_LINK_LIBRARIES(vtkSimpleMode vtkPVVTKExtensionsRendering vtkFiltersGeneral vtkFiltersCore vtkRenderingOpenGL2 ${PARAVIEW_LIBRARIES})
-INSTALL(TARGETS vtkSimpleMode RUNTIME DESTINATION lib/salome LIBRARY DESTINATION lib/salome ARCHIVE DESTINATION lib/salome)

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

diff --git a/src/Plugins/SimpleMode/ParaViewPlugin/CMakeLists.txt b/src/Plugins/SimpleMode/ParaViewPlugin/CMakeLists.txt
index 1d875eb7ca48c6b4421856cf2a666bc9d7971627..2fd1a2b1704c16ff74f1062023aa78eb991d9856 100644 (file)
--- a/src/Plugins/SimpleMode/ParaViewPlugin/CMakeLists.txt
+++ b/src/Plugins/SimpleMode/ParaViewPlugin/CMakeLists.txt
@@ -20,9 +20,6 @@
 
 INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/../IO )
 ADD_PARAVIEW_PLUGIN(SimpleModePlugin "4.0"
-  SERVER_MANAGER_SOURCES ${SM_SRCS}
-  SERVER_MANAGER_XML Resources/SimpleModeServer.xml
-  CS_KITS
-  vtkSimpleMode)
-TARGET_LINK_LIBRARIES(SimpleModePlugin vtkSimpleMode vtkSimpleModeCS)
+  SERVER_MANAGER_SOURCES ${SM_SRCS} ${PROJECT_SOURCE_DIR}/IO/vtkSimpleMode.cxx
+  SERVER_MANAGER_XML Resources/SimpleModeServer.xml)
 INSTALL(TARGETS SimpleModePlugin RUNTIME DESTINATION lib/paraview LIBRARY DESTINATION lib/paraview ARCHIVE DESTINATION lib/paraview)