Commit 044b2613 authored by Nathan's avatar Nathan

STYLE: Changed the names to avoid collision problems

parent f6899742
......@@ -15,7 +15,7 @@ IF (VTK_USE_MPI)
ENDIF (MPI_EXTRA_LIBRARY)
ENDIF (MPI_LIBRARIES)
ELSE (VTK_USE_MPI)
SET (mrmpi_LIBS mpi)
SET (mrmpi_LIBS mpistubs)
INCLUDE_DIRECTORIES(mrmpi ${VTK_SOURCE_DIR}/Utilities/mrmpi/mpistubs)
ADD_SUBDIRECTORY (mpistubs)
ENDIF (VTK_USE_MPI)
......
SET (mpi_SOURCES mpi.cpp)
SET (mpistubs_SOURCES mpi.cpp)
ADD_LIBRARY (mpi ${mpi_SOURCES})
TARGET_LINK_LIBRARIES (mpi vtksys)
ADD_LIBRARY (mpistubs ${mpistubs_SOURCES})
TARGET_LINK_LIBRARIES (mpistubs vtksys)
IF(VTK_LIBRARY_PROPERTIES)
SET_TARGET_PROPERTIES(mpi PROPERTIES ${VTK_LIBRARY_PROPERTIES})
SET_TARGET_PROPERTIES(mpistubs PROPERTIES ${VTK_LIBRARY_PROPERTIES})
ENDIF(VTK_LIBRARY_PROPERTIES)
......@@ -7,8 +7,8 @@ SET (mrmpi_SOURCES
memory.cpp
error.cpp)
ADD_LIBRARY (mrmpi ${mrmpi_SOURCES})
TARGET_LINK_LIBRARIES (mrmpi ${mrmpi_LIBS})
ADD_LIBRARY (MapReduceMPI ${mrmpi_SOURCES})
TARGET_LINK_LIBRARIES (MapReduceMPI ${mrmpi_LIBS})
IF(VTK_LIBRARY_PROPERTIES)
SET_TARGET_PROPERTIES(mrmpi PROPERTIES ${VTK_LIBRARY_PROPERTIES})
SET_TARGET_PROPERTIES(MapReduceMPI PROPERTIES ${VTK_LIBRARY_PROPERTIES})
ENDIF(VTK_LIBRARY_PROPERTIES)
Markdown is supported
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