Updated location of the mpi libraries to handle 32 and 64 bit.

Resolves pull-request https://github.com/OpenFOAM/ThirdParty-dev/pull/1
This commit is contained in:
Henry
2015-01-29 15:09:37 +00:00
parent 630e3a5f15
commit 169af3dbcd

View File

@ -2,7 +2,7 @@
# ========= | # ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration | # \\ / O peration |
# \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation # \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
# \\/ M anipulation | # \\/ M anipulation |
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# License # License
@ -166,10 +166,10 @@ addMpiSupport()
addCMakeVariable "PARAVIEW_USE_MPI=ON VTK_USE_MPI=ON" addCMakeVariable "PARAVIEW_USE_MPI=ON VTK_USE_MPI=ON"
addCMakeVariable "MPI_INCLUDE_PATH=$MPI_ARCH_PATH/include" addCMakeVariable "MPI_INCLUDE_PATH=$MPI_ARCH_PATH/include"
addCMakeVariable "MPI_LIBRARY=$MPI_ARCH_PATH/lib/libmpi.so" addCMakeVariable "MPI_LIBRARY=$MPI_ARCH_PATH/lib${WM_COMPILER_LIB_ARCH}/libmpi.so"
if [ -e $MPI_ARCH_PATH/lib/libmpi_cxx.so ] if [ -e $MPI_ARCH_PATH/lib${WM_COMPILER_LIB_ARCH}/libmpi_cxx.so ]
then then
addCMakeVariable "MPI_EXTRA_LIBRARY=$MPI_ARCH_PATH/lib/libmpi_cxx.so" addCMakeVariable "MPI_EXTRA_LIBRARY=$MPI_ARCH_PATH/lib${WM_COMPILER_LIB_ARCH}/libmpi_cxx.so"
fi fi
addCMakeVariable "VTK_MPIRUN_EXE=$MPI_ARCH_PATH/bin/mpirun" addCMakeVariable "VTK_MPIRUN_EXE=$MPI_ARCH_PATH/bin/mpirun"
addCMakeVariable "VTK_MPI_MAX_NUMPROCS=$MPI_MAX_PROCS" addCMakeVariable "VTK_MPI_MAX_NUMPROCS=$MPI_MAX_PROCS"