Commit 070804e4 authored by Jeff Baumes's avatar Jeff Baumes
Browse files

Fixing multi-path MPI include issue

When there are multiple include directories for MPI,
as happens on Ubuntu with openmpi, quoting the argument
to INCLUDE_DIRECTORIES causes both to be treated as
one path, and MPI includes cannot be found.
parent b7d8123f
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)
......
......@@ -105,7 +105,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)
......
......@@ -151,7 +151,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}
......
......@@ -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)
......
......@@ -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)
......
......@@ -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)
......
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}")
......
......@@ -273,7 +273,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)
......
......@@ -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)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment