From: Dawid Jagiela <lightnir@chem.univ.gda.pl>
Date: Sat, 12 May 2012 21:10:42 +0000 (+0200)
Subject: Additional MPI libraries search path added
X-Git-Tag: v.3.2~115^2~15
X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?p=unres.git;a=commitdiff_plain;h=a2739cd7805aa18d9b8a2ef5ef3f0b70ddf6e226

Additional MPI libraries search path added
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e1daf9c..e01208a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -79,8 +79,9 @@ if(MPIF_LOCAL_DIR)
   find_library(MPIF_LIBRARY NAMES libmpich.a  NO_DEFAULT_PATH  PATHS  ${MPIF_LOCAL_DIR}/lib)
   find_path( MPIF_INCLUDE_DIRECTORIES  NAMES mpif.h  NO_DEFAULT_PATH  PATHS  ${MPIF_LOCAL_DIR}/include  )
 else(MPIF_LOCAL_DIR)
-  find_library(MPIF_LIBRARY NAMES mpich mpi PATHS 
+  find_library(MPIF_LIBRARY NAMES mpi mpich PATHS 
 	${MPI_LIBRARY}
+	${MPI_EXTRA_LIBRARY}
 	/users/local/mpi64/mpich-1.2.7p1/lib 
 	/usr/lib
         /usr/local/lib
@@ -137,9 +138,9 @@ message("Detected ${architektura}-bit architecture")
 #=======================================     
 
 
-if(UNRES_NA_MMCE EQUAL "ON")
+if(UNRES_NA_MMCE)
 
-  if(UNRES_WITH_MPI EQUAL "ON")
+  if(UNRES_WITH_MPI)
     # Brak MPI dla gfortrana, wiec tylko na ifort sie skompiluje
     if (Fortran_COMPILER_NAME STREQUAL "ifort")
       add_subdirectory(source/unres/src_MD)
@@ -156,11 +157,11 @@ if(UNRES_NA_MMCE EQUAL "ON")
 else()
 
   add_subdirectory(source/unres/src_MD)
-  if(UNRES_WITH_MPI EQUAL "ON")
+  if(UNRES_WITH_MPI)
     add_subdirectory(source/unres/src_MD-M)
     add_subdirectory(source/unres/src_CSA)
-  endif(UNRES_WITH_MPI EQUAL "ON")
+  endif(UNRES_WITH_MPI)
   add_subdirectory(source/unres/src_MIN)
 
-endif(UNRES_NA_MMCE EQUAL "ON")
+endif(UNRES_NA_MMCE)