blob: fec1d67bd0aaa8f1fe76bef6b8ff9b5e1a04530c (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
|
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)
+
|
GitWeb
