From ce88e26b8fe2651e9dadbf7a928ea8bdee555423 Mon Sep 17 00:00:00 2001 From: Henry Date: Sat, 7 Mar 2015 15:09:01 +0000 Subject: [PATCH] ParaViewFunctions and ParaView4Functions: Updated to automatically support building with the system MPI irrespective of version Resolves bug-report http://www.openfoam.org/mantisbt/view.php?id=1549 --- etc/tools/ParaView4Functions | 7 ------- etc/tools/ParaViewFunctions | 9 +-------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/etc/tools/ParaView4Functions b/etc/tools/ParaView4Functions index 8ac527e..63385fb 100644 --- a/etc/tools/ParaView4Functions +++ b/etc/tools/ParaView4Functions @@ -165,13 +165,6 @@ addMpiSupport() OBJ_ADD="$OBJ_ADD-mpi" addCMakeVariable "PARAVIEW_USE_MPI=ON VTK_USE_MPI=ON" - addCMakeVariable "MPI_INCLUDE_PATH=$MPI_ARCH_PATH/include" - addCMakeVariable "MPI_LIBRARY=$MPI_ARCH_PATH/lib${WM_COMPILER_LIB_ARCH}/libmpi.so" - if [ -e $MPI_ARCH_PATH/lib${WM_COMPILER_LIB_ARCH}/libmpi_cxx.so ] - then - addCMakeVariable "MPI_EXTRA_LIBRARY=$MPI_ARCH_PATH/lib${WM_COMPILER_LIB_ARCH}/libmpi_cxx.so" - fi - addCMakeVariable "VTK_MPIRUN_EXE=$MPI_ARCH_PATH/bin/mpirun" addCMakeVariable "VTK_MPI_MAX_NUMPROCS=$MPI_MAX_PROCS" } diff --git a/etc/tools/ParaViewFunctions b/etc/tools/ParaViewFunctions index c899556..c4811c6 100644 --- a/etc/tools/ParaViewFunctions +++ b/etc/tools/ParaViewFunctions @@ -2,7 +2,7 @@ # ========= | # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / O peration | -# \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation +# \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation # \\/ M anipulation | #------------------------------------------------------------------------------ # License @@ -165,13 +165,6 @@ addMpiSupport() OBJ_ADD="$OBJ_ADD-mpi" addCMakeVariable "PARAVIEW_USE_MPI=ON VTK_USE_MPI=ON" - addCMakeVariable "MPI_INCLUDE_PATH=$MPI_ARCH_PATH/include" - addCMakeVariable "MPI_LIBRARY=$MPI_ARCH_PATH/lib/libmpi.so" - if [ -e $MPI_ARCH_PATH/lib/libmpi_cxx.so ] - then - addCMakeVariable "MPI_EXTRA_LIBRARY=$MPI_ARCH_PATH/lib/libmpi_cxx.so" - fi - addCMakeVariable "VTK_MPIRUN_EXE=$MPI_ARCH_PATH/bin/mpirun" addCMakeVariable "VTK_MPI_MAX_NUMPROCS=$MPI_MAX_PROCS" }