From: Anthony Geay Date: Thu, 8 Mar 2018 10:43:42 +0000 (+0100) Subject: UnModulizePlgs : SimpleMode X-Git-Tag: SHAPER_V9_1_0RC1~5^2 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=886211ff9d9eff83c0ab10fe8c49657a54013fe4;p=modules%2Fparavis.git UnModulizePlgs : SimpleMode Conflicts: src/Plugins/SimpleMode/IO/CMakeLists.txt --- 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/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)