Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Christian Butz
VTK
Commits
b52be2cb
Commit
b52be2cb
authored
Oct 10, 2011
by
Dave Partyka
Committed by
Kitware Robot
Oct 10, 2011
Browse files
Merge topic 'mpi-include-fix' into pv-master
070804e4
Fixing multi-path MPI include issue
parents
6f7745de
070804e4
Changes
9
Hide whitespace changes
Inline
Side-by-side
Examples/ParallelProcessing/Generic/Cxx/CMakeLists.txt
View file @
b52be2cb
INCLUDE_REGULAR_EXPRESSION
(
"^(lex|vtk|png|j|Task|Pipe).*$"
)
IF
(
VTK_USE_MPI
)
INCLUDE_DIRECTORIES
(
"
${
MPI_INCLUDE_PATH
}
"
)
INCLUDE_DIRECTORIES
(
${
MPI_INCLUDE_PATH
}
)
IF
(
MPI_LIBRARY
)
SET
(
MPI_LIBRARIES
${
MPI_LIBRARY
}
)
ENDIF
(
MPI_LIBRARY
)
...
...
Infovis/Testing/Cxx/CMakeLists.txt
View file @
b52be2cb
...
...
@@ -107,7 +107,7 @@ IF (VTK_USE_RENDERING AND VTK_USE_DISPLAY)
ENDIF
(
VTK_USE_BOOST
)
IF
(
VTK_USE_PARALLEL AND VTK_USE_MPI
)
INCLUDE_DIRECTORIES
(
"
${
MPI_INCLUDE_PATH
}
"
)
INCLUDE_DIRECTORIES
(
${
MPI_INCLUDE_PATH
}
)
IF
(
MPI_LIBRARY
)
SET
(
MPI_LIBRARIES
${
MPI_LIBRARY
}
)
ENDIF
(
MPI_LIBRARY
)
...
...
Parallel/CMakeLists.txt
View file @
b52be2cb
...
...
@@ -154,7 +154,7 @@ ENDIF(VTK_USE_RENDERING)
IF
(
VTK_USE_MPI
)
INCLUDE
(
FindMPI
)
INCLUDE_DIRECTORIES
(
"
${
MPI_INCLUDE_PATH
}
"
)
INCLUDE_DIRECTORIES
(
${
MPI_INCLUDE_PATH
}
)
SET
(
Kit_SRCS
${
Kit_SRCS
}
...
...
Parallel/Testing/Cxx/CMakeLists.txt
View file @
b52be2cb
...
...
@@ -62,7 +62,7 @@ IF(VTK_USE_DISPLAY AND VTK_USE_RENDERING)
ENDIF
(
HAVE_SOCKETS
)
IF
(
VTK_USE_MPI
)
INCLUDE_DIRECTORIES
(
"
${
MPI_INCLUDE_PATH
}
"
)
INCLUDE_DIRECTORIES
(
${
MPI_INCLUDE_PATH
}
)
IF
(
MPI_LIBRARY
)
SET
(
MPI_LIBRARIES
${
MPI_LIBRARY
}
)
ENDIF
(
MPI_LIBRARY
)
...
...
Utilities/Cosmo/CMakeLists.txt
View file @
b52be2cb
...
...
@@ -5,7 +5,7 @@ project(Cosmo)
SET
(
Cosmo_LIBS
)
IF
(
VTK_USE_MPI
)
INCLUDE_DIRECTORIES
(
"
${
MPI_INCLUDE_PATH
}
"
)
INCLUDE_DIRECTORIES
(
${
MPI_INCLUDE_PATH
}
)
IF
(
MPI_EXTRA_LIBRARY
)
SET
(
Cosmo_LIBS
${
MPI_LIBRARY
}
${
MPI_EXTRA_LIBRARY
}
)
ELSE
(
MPI_EXTRA_LIBRARY
)
...
...
Utilities/VPIC/CMakeLists.txt
View file @
b52be2cb
...
...
@@ -17,7 +17,7 @@ SET(VPIC_SOURCES
)
IF
(
VTK_USE_MPI
)
INCLUDE_DIRECTORIES
(
"
${
MPI_INCLUDE_PATH
}
"
)
INCLUDE_DIRECTORIES
(
${
MPI_INCLUDE_PATH
}
)
ADD_DEFINITIONS
(
"-DUSE_PARALLEL_VPIC -DMPICH_IGNORE_CXX_SEEK"
)
ENDIF
(
VTK_USE_MPI
)
...
...
Utilities/mrmpi/CMakeLists.txt
View file @
b52be2cb
PROJECT
(
MAPREDUCE
)
IF
(
VTK_USE_MPI
)
INCLUDE_DIRECTORIES
(
"
${
MPI_INCLUDE_PATH
}
"
)
INCLUDE_DIRECTORIES
(
${
MPI_INCLUDE_PATH
}
)
ADD_DEFINITIONS
(
"-DMPICH_IGNORE_CXX_SEEK"
)
IF
(
MPI_LIBRARY
)
SET
(
mrmpi_LIBS
"
${
MPI_LIBRARY
}
"
)
...
...
Wrapping/Python/CMakeLists.txt
View file @
b52be2cb
...
...
@@ -295,7 +295,7 @@ ENDIF(VTK_USE_MATLAB_MEX)
SET
(
PVTKPYTHON_EXECUTABLE
)
# Create the pvtkpython Python wrapper executable with MPI support.
IF
(
VTK_USE_PARALLEL AND VTK_USE_MPI
)
INCLUDE_DIRECTORIES
(
"
${
MPI_INCLUDE_PATH
}
"
)
INCLUDE_DIRECTORIES
(
${
MPI_INCLUDE_PATH
}
)
IF
(
MPI_LIBRARY
)
SET
(
MPI_LIBRARIES
${
MPI_LIBRARY
}
)
ENDIF
(
MPI_LIBRARY
)
...
...
Wrapping/Tcl/CMakeLists.txt
View file @
b52be2cb
...
...
@@ -135,7 +135,7 @@ ENDIF(NOT VTK_INSTALL_NO_RUNTIME)
# Create the pvtk Tcl wrapper executable with MPI support.
IF
(
VTK_USE_PARALLEL
)
IF
(
VTK_USE_MPI
)
INCLUDE_DIRECTORIES
(
"
${
MPI_INCLUDE_PATH
}
"
)
INCLUDE_DIRECTORIES
(
${
MPI_INCLUDE_PATH
}
)
IF
(
MPI_LIBRARY
)
SET
(
MPI_LIBRARIES
${
MPI_LIBRARY
}
)
ENDIF
(
MPI_LIBRARY
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment