Mpi reactivated

Author: lelandaisb

src/VtkContrib/CMakeLists.txt

@@ -5,14 +5,16 @@ include (${CMAKE_SOURCE_DIR}/cmake/version.cmake)
 include (${CMAKE_SOURCE_DIR}/cmake/common.cmake)
 include (${CMAKE_SOURCE_DIR}/cmake/workarounds.cmake)
 
+# Curieusement les dépendances semblent inexister avec cette version de VTK, ou ne sont pas bien prises en compte ...
+# => On ajoute MPI
 if (VTK_7)
 	if (USE_OPENGL_BACKEND)
-		set (VTK_REQUIRED_PACKAGES vtkRenderingLOD vtkInteractionStyle vtkFiltersHybrid vtkFiltersExtraction vtkFiltersCore vtkCommonTransforms vtkCommonMath vtkInteractionWidgets vtkImagingHybrid vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingLabel vtkFiltersImaging vtkRenderingGL2PS vtkIOImage vtkIOLegacy vtkIOExportOpenGL vtkIOExport vtkIOXML vtkIOCore vtkCommonExecutionModel vtkCommonDataModel vtkRenderingAnnotation vtkFiltersSources vtkFiltersGeometry vtkFiltersGeneral vtkRenderingCore vtkCommonSystem vtkCommonCore vtkgl2ps vtkpng vtksys)
+		set (VTK_REQUIRED_PACKAGES vtkRenderingLOD vtkInteractionStyle vtkFiltersHybrid vtkFiltersExtraction vtkFiltersCore vtkCommonTransforms vtkCommonMath vtkInteractionWidgets vtkParallelMPI vtkRenderingParallel vtkParallelCore vtkImagingHybrid vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingLabel vtkFiltersImaging vtkRenderingGL2PS vtkIOImage vtkIOLegacy vtkIOExportOpenGL vtkIOExport vtkIOXML vtkIOCore vtkCommonExecutionModel vtkCommonDataModel vtkRenderingAnnotation vtkFiltersSources vtkFiltersGeometry vtkFiltersGeneral vtkRenderingCore vtkCommonSystem vtkCommonCore vtkgl2ps vtkpng vtksys)
 		set (VTK_OPENGL_BACKEND OpenGL)
 	else (USE_OPENGL_BACKEND)
 		set (VTK_REQUIRED_PACKAGES vtkRenderingLOD vtkInteractionStyle vtkFiltersHybrid vtkFiltersExtraction vtkFiltersCore #
-	                           vtkCommonTransforms vtkCommonMath vtkInteractionWidgets #
-	                           vtkImagingHybrid vtkRenderingOpenGL2 vtkRenderingFreeType vtkRenderingLabel #
+	                           vtkCommonTransforms vtkCommonMath vtkInteractionWidgets vtkParallelMPI vtkRenderingParallel #
+	                           vtkParallelCore vtkImagingHybrid vtkRenderingOpenGL2 vtkRenderingFreeType vtkRenderingLabel #
 	                           vtkFiltersImaging vtkRenderingGL2PSOpenGL2 vtkIOImage vtkIOLegacy vtkIOExportOpenGL2 vtkIOExport #
 	                           vtkIOXML vtkIOCore vtkCommonExecutionModel vtkCommonDataModel vtkRenderingAnnotation vtkFiltersSources #
 	                           vtkFiltersGeometry vtkFiltersGeneral vtkRenderingCore vtkCommonCore vtkgl2ps vtkpng vtksys #
@@ -24,22 +26,28 @@ if (VTK_7)
 	find_package (VTK 7.1 REQUIRED COMPONENTS ${VTK_REQUIRED_PACKAGES})
 	set (VTK_LIB_DEPENDENCIES ${VTK_REQUIRED_PACKAGES})
 	set (VTK_INC_DEPENDENCIES ${VTK_INCLUDE_DIRS})
+	# Suite pb sur une plateforme :
+	if (MPI_mpi_LIBRARY)
+		set (VTK_LIB_DEPENDENCIES "${VTK_LIB_DEPENDENCIES};${MPI_mpi_LIBRARY}")
+	endif (MPI_mpi_LIBRARY)	# if (MPI_mpi_LIBRARY)
 elseif (VTK_8)
-	set (VTK_REQUIRED_PACKAGES vtkIOExport vtkIOImage vtkInteractionWidgets vtkRenderingOpenGL2)
+	set (VTK_REQUIRED_PACKAGES vtkParallelMPI vtkParallelCore vtkRenderingParallel vtkIOExport vtkIOImage vtkInteractionWidgets vtkRenderingOpenGL2)
 	find_package (VTK 8 REQUIRED COMPONENTS ${VTK_REQUIRED_PACKAGES})
 	include(${VTK_USE_FILE})	# From Examples/GUI/Qt/ImageViewer/CMakeLists.txt
 	set (VTK_LIB_DEPENDENCIES ${VTK_LIBRARIES})
 	set (VTK_INC_DEPENDENCIES)	# Empty, not usefull with VTK 8
 	set (VTK_OPENGL_BACKEND OpenGL2)
 elseif (VTK_9)
 	message (STATUS "========================================= UTILISATION DE VTK 9 =========================================")
-	set (VTK_REQUIRED_PACKAGES IOExport IOImage InteractionWidgets RenderingOpenGL2)
+	set (VTK_REQUIRED_PACKAGES ParallelMPI IOMPIParallel IOParallel ParallelCore ParallelMPI IOExport IOImage InteractionWidgets RenderingOpenGL2)
 	find_package (VTK 9 REQUIRED COMPONENTS ${VTK_REQUIRED_PACKAGES})
 	set (VTK_LIB_DEPENDENCIES ${VTK_LIBRARIES})
 	set (VTK_INC_DEPENDENCIES)	# Empty, not usefull with VTK 9
 	set (VTK_OPENGL_BACKEND OpenGL2)
 endif (VTK_7)	
 
+find_package (MPI)
+
 file (GLOB HEADERS public/${CURRENT_PACKAGE_NAME}/*.h)
 file (GLOB CPP_SOURCES *.cpp)
 
@@ -61,9 +69,26 @@ target_include_directories (VtkContrib PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_
 target_compile_definitions (VtkContrib PUBLIC ${VTK_CONTRIB_PUBLIC_FLAGS})
 target_compile_definitions (VtkContrib PRIVATE ${VTK_CONTRIB_PRIVATE_FLAGS})
 target_compile_options (VtkContrib PRIVATE ${SHARED_CFLAGS})	# Requested by Qt ...
-target_include_directories (VtkContrib PUBLIC ${VTK_INC_DEPENDENCIES})
-target_link_libraries (VtkContrib PUBLIC ${VTK_LIB_DEPENDENCIES})
+target_include_directories (VtkContrib PUBLIC ${VTK_INC_DEPENDENCIES} ${VTK_MPI_INC_DIR})
+if (VTK_MPI_CFLAGS)
+	target_compile_options (VtkContrib PUBLIC ${VTK_MPI_CFLAGS})
+endif (VTK_MPI_CFLAGS)
+if (VTK_MPI_LDFLAGS)
+	target_link_options (VtkContrib PUBLIC ${VTK_MPI_LDFLAGS})
+endif (VTK_MPI_LDFLAGS)
+target_link_libraries (VtkContrib PUBLIC ${VTK_LIB_DEPENDENCIES} ${VTK_MPI_LIBS})
+
 
+# ============================================= ATTENTION : ZONE SENSIBLE ==============================================
+# On gère ici toute la misère du monde ...
+# EXPURGE_BEGINNING_TAG	OMPI_CALC
+# EXPURGE_COMPLETION_TAG	
+if (NOT ${PLATFORM} STREQUAL "Ubuntu")
+	if (VTK_MPI_LIB_DIR)
+		target_link_directories (VtkContrib PUBLIC "${VTK_MPI_LIB_DIR}")	# Probablement à revoir par la suite car entraîné par VTK
+	endif (VTK_MPI_LIB_DIR)
+endif (NOT ${PLATFORM} STREQUAL "Ubuntu")
+# ============================================= !ATTENTION : ZONE SENSIBLE ==============================================
 
 # Etre capable une fois installée de retrouver vtk*, ... :
 # (Rem : en son absence on a Set runtime path of "/tmp/pignerol/install/lib/libVtkContrib.so.5.0.0" to "") ...