projects
/
unres.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
ece1047
)
Additional MPI libraries search path added
author
Dawid Jagiela
<lightnir@chem.univ.gda.pl>
Sat, 12 May 2012 21:10:42 +0000
(23:10 +0200)
committer
Dawid Jagiela
<lightnir@chem.univ.gda.pl>
Sat, 12 May 2012 21:10:42 +0000
(23:10 +0200)
CMakeLists.txt
patch
|
blob
|
history
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index
e1daf9c
..
e01208a
100644
(file)
--- 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 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_LIBRARY}
+ ${MPI_EXTRA_LIBRARY}
/users/local/mpi64/mpich-1.2.7p1/lib
/usr/lib
/usr/local/lib
/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)
# 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)
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)
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)
add_subdirectory(source/unres/src_MIN)
-endif(UNRES_NA_MMCE EQUAL "ON")
+endif(UNRES_NA_MMCE)