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

diff --git a/source/cluster/wham/src-M/CMakeLists.txt b/source/cluster/wham/src-M/CMakeLists.txt
index d4b9ae5..bb99f2a 100644
--- a/source/cluster/wham/src-M/CMakeLists.txt
+++ b/source/cluster/wham/src-M/CMakeLists.txt
@@ -67,9 +67,11 @@ elseif (Fortran_COMPILER_NAME STREQUAL "gfortran")
   set(FFLAGS0 "-std=legacy -I. -I${CMAKE_CURRENT_SOURCE_DIR}/include_unres" ) 
 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_CLUSTER_WHAM_M_SRC0} PROPERTY COMPILE_FLAGS ${FFLAGS0} )
@@ -89,7 +91,14 @@ elseif(UNRES_MD_FF STREQUAL "E0LL2Y")
    set(CPPFLAGS "PROCOR  -DSPLITELE -DSCCORPDB" )
 endif(UNRES_MD_FF STREQUAL "GAB")
 
+#=========================================
+# Additional flags
+#=========================================
+set(CPPFLAGS "${CPPFLAGS} -DUNRES -DISNAN") 
 
+#=========================================
+# Compiler specific flags
+#=========================================
 if (Fortran_COMPILER_NAME STREQUAL "ifort")
   # Add ifort preprocessor flags
   set(CPPFLAGS "${CPPFLAGS} -DPGI") 
@@ -159,9 +168,9 @@ set_target_properties(UNRES_CLUSTER_WHAM_M_BIN PROPERTIES OUTPUT_NAME ${UNRES_CL
 #=========================================
 # Link libraries
 #=========================================
-# link MPI library (libmpich.a)  
+# link MPI libraries
 if(UNRES_WITH_MPI)
-  target_link_libraries( UNRES_CLUSTER_WHAM_M_BIN ${MPIF_LIBRARIES} )
+  target_link_libraries( UNRES_CLUSTER_WHAM_M_BIN ${MPI_Fortran_LIBRARIES} )
 endif(UNRES_WITH_MPI)
 # link libxdrf.a 
 target_link_libraries( UNRES_CLUSTER_WHAM_M_BIN xdrf )