pierwsza proba merga devela do adasko

[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 2177570..c107311 100644 (file)
--- a/source/wham/src-M/CMakeLists.txt
+++ b/source/wham/src-M/CMakeLists.txt
@@ -118,11 +118,22 @@ 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")
 
@@ -130,6 +141,7 @@ endif(UNRES_MD_FF STREQUAL "GAB")
 # Additional flags
 #=========================================
 set(CPPFLAGS "${CPPFLAGS} -DUNRES -DISNAN") 
+>>>>>>> devel
 
 #=========================================
 # System specific flags