# 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")
#=========================================
# Additional flags
#=========================================
-set(CPPFLAGS "${CPPFLAGS} -DUNRES -DISNAN"
+set(CPPFLAGS "${CPPFLAGS} -DUNRES -DISNAN")
+>>>>>>> devel
#=========================================
# System specific flags
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")
#=========================================