[gentoo-commits] gentoo-x86 commit in sci-libs/vtk/files: vtk-5.0.3-mpi.patch vtk-5.0.3-lammpi.patch vtk-5.0.1-python2.5-gentoo.patch

[gentoo-commits] gentoo-x86 commit in sci-libs/vtk/files: vtk-5.0.3-mpi.patch vtk-5.0.3-lammpi.patch vtk-5.0.1-python2.5-gentoo.patch

[Markus Dittrich (markusle)]

markusle    08/02/22 13:35:14

  Added:                vtk-5.0.3-mpi.patch
  Removed:              vtk-5.0.3-lammpi.patch
                        vtk-5.0.1-python2.5-gentoo.patch
  Log:
  Removed support for mpich and added support for mpich2, openmpi, and lam-mpi. Also fixed some QA issues and added qt4 eclass.
  (Portage version: 2.1.4.4)

Revision  Changes    Path
1.1                  sci-libs/vtk/files/vtk-5.0.3-mpi.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/vtk/files/vtk-5.0.3-mpi.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/vtk/files/vtk-5.0.3-mpi.patch?rev=1.1&content-type=text/plain

Index: vtk-5.0.3-mpi.patch
===================================================================
diff -Naur VTK/Parallel/CMakeLists.txt VTK.new/Parallel/CMakeLists.txt
--- VTK/Parallel/CMakeLists.txt	2007-03-28 15:38:46.000000000 -0500
+++ VTK.new/Parallel/CMakeLists.txt	2008-02-21 15:16:04.000000000 -0500
@@ -78,6 +78,8 @@
 
 IF (VTK_USE_MPI)
   INCLUDE (${CMAKE_ROOT}/Modules/FindMPI.cmake)
+  INCLUDE(${VTK_SOURCE_DIR}/Parallel/FindLAMMPI.cmake)
+  INCLUDE(${VTK_SOURCE_DIR}/Parallel/FindOpenmpi.cmake)
   SET ( Kit_SRCS
     ${Kit_SRCS}
     vtkMPICommunicator.cxx
@@ -94,6 +96,18 @@
   IF (MPI_EXTRA_LIBRARY)   
     SET(KIT_LIBS ${KIT_LIBS} "${MPI_EXTRA_LIBRARY}")   
   ENDIF (MPI_EXTRA_LIBRARY) 
+  IF (LAMMPI_LIBRARY) 
+    SET(KIT_LIBS ${KIT_LIBS} "${LAMMPI_LIBRARY}")   
+  ENDIF (LAMMPI_LIBRARY)   
+  IF (LAMMPI_EXTRA_LIBRARY)   
+    SET(KIT_LIBS ${KIT_LIBS} "${LAMMPI_EXTRA_LIBRARY}")   
+  ENDIF (LAMMPI_EXTRA_LIBRARY) 
+  IF (OPENMPI_LIBRARY) 
+    SET(KIT_LIBS ${KIT_LIBS} "${OPENMPI_LIBRARY}")   
+  ENDIF (OPENMPI_LIBRARY)   
+  IF (OPENMPI_EXTRA_LIBRARY)   
+    SET(KIT_LIBS ${KIT_LIBS} "${OPENMPI_EXTRA_LIBRARY}")   
+  ENDIF (OPENMPI_EXTRA_LIBRARY)
 ENDIF (VTK_USE_MPI)
 
 SET(Kit_EXTRA_SRCS)
diff -Naur VTK/Parallel/FindLAMMPI.cmake VTK.new/Parallel/FindLAMMPI.cmake
--- VTK/Parallel/FindLAMMPI.cmake	1969-12-31 19:00:00.000000000 -0500
+++ VTK.new/Parallel/FindLAMMPI.cmake	2008-02-21 15:13:38.000000000 -0500
@@ -0,0 +1,17 @@
+# - Find LamMPI
+FIND_LIBRARY(LAMMPI_LIBRARY 
+             NAMES lam
+             PATHS /usr/lib /usr/lib64 
+             "$ENV{ProgramFiles}/MPICH/SDK/Lib"
+             "$ENV{ProgramFiles}/MPICH2/Lib"
+             "C:/Program Files/MPICH/SDK/Lib" 
+)
+
+FIND_LIBRARY(LAMMPI_EXTRA_LIBRARY 
+             NAMES lammpi++
+             PATHS /usr/lib /usr/lib64 
+             "$ENV{ProgramFiles}/MPICH/SDK/Lib"
+             "C:/Program Files/MPICH/SDK/Lib" 
+             DOC "If a second mpi library is necessary, specify it here.")
+
+MARK_AS_ADVANCED(LAMMPI_LIBRARY LAMMPI_EXTRA_LIBRARY)
diff -Naur VTK/Parallel/FindOpenmpi.cmake VTK.new/Parallel/FindOpenmpi.cmake
--- VTK/Parallel/FindOpenmpi.cmake	1969-12-31 19:00:00.000000000 -0500
+++ VTK.new/Parallel/FindOpenmpi.cmake	2008-02-21 15:14:23.000000000 -0500
@@ -0,0 +1,18 @@
+# - Find openmpi
+FIND_PATH(MPI_INCLUDE_PATH mpi.h 
+          /usr/include 
+          /usr/include/openmpi
+)
+
+FIND_LIBRARY(OPENMPI_LIBRARY 
+             NAMES mpi
+             PATHS /usr/lib /usr/lib64 
+)
+
+FIND_LIBRARY(OPENMPI_EXTRA_LIBRARY 
+             NAMES mpi_cxx
+             PATHS /usr/lib /usr/lib64 
+             DOC "If a second mpi library is necessary, specify it here.")
+
+MARK_AS_ADVANCED(OPENMPI_LIBRARY OPENMPI_EXTRA_LIBRARY)
+



-- 
gentoo-commits@lists.gentoo.org mailing list