projects
/
unres.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
switched to CMake FindMPI module in all source files that use MPI
[unres.git]
/
source
/
wham
/
src-M
/
CMakeLists.txt
diff --git
a/source/wham/src-M/CMakeLists.txt
b/source/wham/src-M/CMakeLists.txt
index
d534ddb
..
d5bd2c4
100644
(file)
--- a/
source/wham/src-M/CMakeLists.txt
+++ b/
source/wham/src-M/CMakeLists.txt
@@
-106,7
+106,7
@@
endif (Fortran_COMPILER_NAME STREQUAL "ifort")
# Add MPI compiler flags
#=========================================
if(UNRES_WITH_MPI)
# Add MPI compiler flags
#=========================================
if(UNRES_WITH_MPI)
- set(FFLAGS0 "${FFLAGS0} -I${MPIF_INCLUDE_DIRECTORIES}")
+ set(FFLAGS0 "${FFLAGS0} -I${MPI_Fortran_INCLUDE_PATH}")
endif(UNRES_WITH_MPI)
set_property(SOURCE ${UNRES_WHAM_M_SRC0} PROPERTY COMPILE_FLAGS ${FFLAGS0} )
endif(UNRES_WITH_MPI)
set_property(SOURCE ${UNRES_WHAM_M_SRC0} PROPERTY COMPILE_FLAGS ${FFLAGS0} )
@@
-118,6
+118,7
@@
if(UNRES_MD_FF STREQUAL "GAB" )
# set preprocesor flags
set(CPPFLAGS "PROCOR -DSPLITELE -DCRYST_BOND -DCRYST_THETA -DCRYST_SC -DSCCORPDB" )
# set preprocesor flags
set(CPPFLAGS "PROCOR -DSPLITELE -DCRYST_BOND -DCRYST_THETA -DCRYST_SC -DSCCORPDB" )
+
#=========================================
# Settings for E0LL2Y force field
#=========================================
#=========================================
# Settings for E0LL2Y force field
#=========================================
@@
-151,6
+152,9
@@
elseif (Fortran_COMPILER_NAME STREQUAL "f95")
elseif (Fortran_COMPILER_NAME STREQUAL "gfortran")
# Add old gfortran flags
set(CPPFLAGS "${CPPFLAGS} -DG77")
elseif (Fortran_COMPILER_NAME STREQUAL "gfortran")
# Add old gfortran flags
set(CPPFLAGS "${CPPFLAGS} -DG77")
+else (Fortran_COMPILER_NAME STREQUAL "ifort")
+ # Default preprocessor flags
+ set(CPPFLAGS "${CPPFLAGS} -DPGI")
endif (Fortran_COMPILER_NAME STREQUAL "ifort")
#=========================================
endif (Fortran_COMPILER_NAME STREQUAL "ifort")
#=========================================
@@
-226,7
+230,7
@@
set_target_properties(UNRES_WHAM_M_BIN PROPERTIES OUTPUT_NAME ${UNRES_WHAM_M_BIN
# Link libraries
#=========================================
# link MPI library (libmpich.a)
# Link libraries
#=========================================
# link MPI library (libmpich.a)
-target_link_libraries( UNRES_WHAM_M_BIN ${MPIF_LIBRARIES} )
+target_link_libraries( UNRES_WHAM_M_BIN ${MPI_Fortran_LIBRARIES} )
# link libxdrf.a
target_link_libraries( UNRES_WHAM_M_BIN xdrf )
# link libxdrf.a
target_link_libraries( UNRES_WHAM_M_BIN xdrf )