X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=source%2Funres%2Fsrc_MD%2FCMakeLists.txt;h=dea499c5187f88ad64d7ef805ad9e18a29921dd9;hb=4f408e0046bb5dad39727ced2f2fec1e5a5fab88;hp=d44dcc5b2e2bd7f53f8dcf82138bc836b62eb7ad;hpb=4d1af7875f88832552e868c042c6988762d80110;p=unres.git

diff --git a/source/unres/src_MD/CMakeLists.txt b/source/unres/src_MD/CMakeLists.txt
index d44dcc5..dea499c 100644
--- a/source/unres/src_MD/CMakeLists.txt
+++ b/source/unres/src_MD/CMakeLists.txt
@@ -161,20 +161,11 @@ elseif (Fortran_COMPILER_NAME STREQUAL "gfortran")
   set(FFLAGS2 "-std=legacy -I. ")
   #set(FFLAGS3 "-c -w -O3 -ipo -ipo_obj -opt_report" )
   set(FFLAGS3 "-std=legacy -I. " )
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-=======
->>>>>>> f3fb02dcb801d48f6bdc6f48c78bc8a3a2c7fb97
 elseif (Fortran_COMPILER_NAME STREQUAL "g77")
   set(FFLAGS0 "-I ${CMAKE_CURRENT_SOURCE_DIR} " ) 
   set(FFLAGS1 "-g -I ${CMAKE_CURRENT_SOURCE_DIR} " ) 
   set(FFLAGS2 "-I ${CMAKE_CURRENT_SOURCE_DIR} ")
   set(FFLAGS3 "-I ${CMAKE_CURRENT_SOURCE_DIR} " )
-<<<<<<< HEAD
->>>>>>> f3fb02dcb801d48f6bdc6f48c78bc8a3a2c7fb97
-=======
->>>>>>> f3fb02dcb801d48f6bdc6f48c78bc8a3a2c7fb97
 endif (Fortran_COMPILER_NAME STREQUAL "ifort")
 
 
@@ -196,14 +187,14 @@ set_property(SOURCE ${UNRES_MD_SRC3} PROPERTY COMPILE_FLAGS ${FFLAGS3} )
 #=========================================
 if(UNRES_MD_FF STREQUAL "GAB" )
   # set preprocesor flags   
-  set(CPPFLAGS "PROCOR -DUNRES -DISNAN -DSPLITELE -DLANG0 -DCRYST_BOND -DCRYST_THETA -DCRYST_SC" )
+  set(CPPFLAGS "PROCOR -DUNRES -DISNAN -DSPLITELE -DLANG0 -DCRYST_BOND -DCRYST_THETA -DCRYST_SC -DSCCORPDB" )
 
 #=========================================
 #  Settings for E0LL2Y force field
 #=========================================
 elseif(UNRES_MD_FF STREQUAL "E0LL2Y")
   # set preprocesor flags   
-  set(CPPFLAGS "PROCOR -DUNRES -DISNAN -DSPLITELE -DLANG0" )
+  set(CPPFLAGS "PROCOR -DUNRES -DISNAN -DSPLITELE -DLANG0 -DSCCORPDB" )
 endif(UNRES_MD_FF STREQUAL "GAB")
 
 #=========================================
@@ -226,18 +217,9 @@ elseif (Fortran_COMPILER_NAME STREQUAL "f95")
 elseif (Fortran_COMPILER_NAME STREQUAL "gfortran")
   # Add old gfortran flags
   set(CPPFLAGS "${CPPFLAGS} -DG77") 
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
 elseif (Fortran_COMPILER_NAME STREQUAL "g77")
   # Add old gfortran flags
   set(CPPFLAGS "${CPPFLAGS} -DG77")
->>>>>>> f3fb02dcb801d48f6bdc6f48c78bc8a3a2c7fb97
-=======
-elseif (Fortran_COMPILER_NAME STREQUAL "g77")
-  # Add old gfortran flags
-  set(CPPFLAGS "${CPPFLAGS} -DG77")
->>>>>>> f3fb02dcb801d48f6bdc6f48c78bc8a3a2c7fb97
 else(Fortran_COMPILER_NAME STREQUAL "ifort")
   # Default preprocessor flag
   set(CPPFLAGS "${CPPFLAGS} -DPGI")