X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=source%2Fwham%2Fsrc-M%2FCMakeLists.txt;h=d5bd2c4f738cca9f61327386800f54719b4bdd3c;hb=200da3496cad2ab08207e94aa56b1e2a431ff112;hp=c107311a28d5c9fc994ed6d74bfaac6d812ed1cf;hpb=462b4b0ab826c82da8fbe9e4425f5329306b1952;p=unres.git

diff --git a/source/wham/src-M/CMakeLists.txt b/source/wham/src-M/CMakeLists.txt
index c107311..d5bd2c4 100644
--- 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)
-  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} )
@@ -118,22 +118,12 @@ if(UNRES_MD_FF STREQUAL "GAB" )
   # set preprocesor flags   
   set(CPPFLAGS "PROCOR  -DSPLITELE -DCRYST_BOND -DCRYST_THETA -DCRYST_SC  -DSCCORPDB" )
 
-<<<<<<< HEAD
-if(UNRES_MD_FF STREQUAL "GAB" )
-  # set preprocesor flags   
-  set(CPPFLAGS "PROCOR -DUNRES -DISNAN -DSPLITELE -DLANG0 -DCRYST_BOND -DCRYST_THETA -DCRYST_SC  -DSCCORPDB" )
 
-=======
->>>>>>> devel
 #=========================================
 #  Settings for E0LL2Y force field
 #=========================================
 elseif(UNRES_MD_FF STREQUAL "E0LL2Y")
   # set preprocesor flags   
-<<<<<<< HEAD
-  set(CPPFLAGS "PROCOR -DUNRES -DISNAN -DSPLITELE -DLANG0 -DSCCORPDB" )
-endif(UNRES_MD_FF STREQUAL "GAB")
-=======
   set(CPPFLAGS "PROCOR  -DSPLITELE -DSCCORPDB" )
 endif(UNRES_MD_FF STREQUAL "GAB")
 
@@ -141,7 +131,6 @@ endif(UNRES_MD_FF STREQUAL "GAB")
 # Additional flags
 #=========================================
 set(CPPFLAGS "${CPPFLAGS} -DUNRES -DISNAN") 
->>>>>>> devel
 
 #=========================================
 # System specific flags
@@ -241,7 +230,7 @@ set_target_properties(UNRES_WHAM_M_BIN PROPERTIES OUTPUT_NAME ${UNRES_WHAM_M_BIN
 # 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 )