From c5de067bd0014037fd9c22fe04fa4588d10fcbcc Mon Sep 17 00:00:00 2001 From: Anthony Geay Date: Thu, 8 Mar 2018 11:43:42 +0100 Subject: [PATCH] UnModulizePlgs : SimpleMode --- src/Plugins/SimpleMode/CMakeLists.txt | 1 - src/Plugins/SimpleMode/IO/CMakeLists.txt | 23 ------------------- src/Plugins/SimpleMode/IO/module.cmake | 2 -- .../SimpleMode/ParaViewPlugin/CMakeLists.txt | 7 ++---- 4 files changed, 2 insertions(+), 31 deletions(-) delete mode 100644 src/Plugins/SimpleMode/IO/CMakeLists.txt delete mode 100644 src/Plugins/SimpleMode/IO/module.cmake diff --git a/src/Plugins/SimpleMode/CMakeLists.txt b/src/Plugins/SimpleMode/CMakeLists.txt index a7e60eb5..69fdb57a 100644 --- 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 index 2bd884fe..00000000 --- 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 index 0e437ca5..00000000 --- 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 1d875eb7..2fd1a2b1 100644 --- 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) -- 2.39.2