]> SALOME platform Git repositories - modules/paravis.git/commitdiff
Salome HOME
UnModulizePlgs : SimpleMode V9_dev
authorAnthony Geay <anthony.geay@edf.fr>
Thu, 8 Mar 2018 10:43:42 +0000 (11:43 +0100)
committeresy <emmanuel.streby@opencascade.com>
Wed, 30 May 2018 11:39:24 +0000 (13:39 +0200)
Conflicts:
src/Plugins/SimpleMode/IO/CMakeLists.txt

src/Plugins/SimpleMode/CMakeLists.txt
src/Plugins/SimpleMode/IO/module.cmake [deleted file]
src/Plugins/SimpleMode/ParaViewPlugin/CMakeLists.txt

index a7e60eb5e7873cc708f063bbb6df91473e5c84e0..69fdb57a28451eea1dfad9bb7c4dbf1dc659402d 100644 (file)
@@ -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 (file)
index 0e437ca..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-SET(VTK_LIBS vtkCommonExecutionModel vtkParallelCore)
-VTK_MODULE(vtkSimpleMode DEPENDS ${VTK_LIBS})
index 1d875eb7ca48c6b4421856cf2a666bc9d7971627..2fd1a2b1704c16ff74f1062023aa78eb991d9856 100644 (file)
@@ -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)