From e1a50df190209e44c163493e94a2d20f25a9c5cd Mon Sep 17 00:00:00 2001 From: Anthony Geay Date: Thu, 8 Mar 2018 08:47:42 +0100 Subject: [PATCH] UnModulizePlgs : MEDWriter --- src/Plugins/MEDWriter/CMakeLists.txt | 6 ++++++ src/Plugins/MEDWriter/IO/CMakeLists.txt | 8 -------- src/Plugins/MEDWriter/IO/module.cmake | 2 -- src/Plugins/MEDWriter/ParaViewPlugin/CMakeLists.txt | 8 +++----- 4 files changed, 9 insertions(+), 15 deletions(-) delete mode 100644 src/Plugins/MEDWriter/IO/module.cmake diff --git a/src/Plugins/MEDWriter/CMakeLists.txt b/src/Plugins/MEDWriter/CMakeLists.txt index 0f3e72f4..653e5cac 100644 --- 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 2b8c2d99..3add0680 100644 --- 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 index 1cd09c95..00000000 --- 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 d992788f..46c6f3eb 100644 --- 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) -- 2.39.2