X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=source%2Fwham%2Fsrc%2FCMakeLists.txt;h=6f762b12a06e4d707cd7c1cd29d9243b2b17dcbb;hb=1f3374cb0eee02172a7f62466aafc1175a1663e0;hp=aca8eb4e8e48ee4eadccca59c2c2c0bc36e04777;hpb=54a1ae6f271c59299330ca1b66d6d7e7fac6443e;p=unres.git

diff --git a/source/wham/src/CMakeLists.txt b/source/wham/src/CMakeLists.txt
index aca8eb4..6f762b1 100644
--- a/source/wham/src/CMakeLists.txt
+++ b/source/wham/src/CMakeLists.txt
@@ -37,6 +37,7 @@ set(UNRES_WHAM_SRC0
 	rescode.f
 	setup_var.f
 	slices.F
+	ssMD.F
 	store_parm.F
 	timing.F
 	wham_calc1.F
@@ -79,6 +80,7 @@ set(UNRES_WHAM_PP_SRC
 	readrtns_compar.F
 	readrtns.F
 	slices.F
+	ssMD.F
 	store_parm.F
 	timing.F
 	wham_calc1.F
@@ -108,10 +110,27 @@ endif(UNRES_WITH_MPI)
 set_property(SOURCE ${UNRES_WHAM_SRC0} PROPERTY COMPILE_FLAGS ${FFLAGS0} )
 
 #=========================================
-# WHAM preprocesor flags
+#  Settings for GAB force field
 #=========================================
 
-set(CPPFLAGS "PROCOR -DUNRES -DISNAN -DSPLITELE -DCRYST_BOND -DCRYST_THETA -DCRYST_SC" )
+if(UNRES_MD_FF STREQUAL "GAB" )
+  # set preprocesor flags   
+  set(CPPFLAGS "PROCOR -DSPLITELE -DCRYST_BOND -DCRYST_THETA -DCRYST_SC  -DSCCORPDB" )
+
+#=========================================
+#  Settings for E0LL2Y force field
+#=========================================
+elseif(UNRES_MD_FF STREQUAL "E0LL2Y")
+  # set preprocesor flags   
+  set(CPPFLAGS "PROCOR  -DSPLITELE -DSCCORPDB" )
+endif(UNRES_MD_FF STREQUAL "GAB")
+
+
+#=========================================
+# Additional flags
+#=========================================
+set(CPPFLAGS "${CPPFLAGS} -DUNRES -DISNAN -DWHAM ") 
+
 
 #=========================================
 # System specific flags
@@ -133,6 +152,9 @@ elseif (Fortran_COMPILER_NAME STREQUAL "f95")
 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")
 
 #=========================================