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

diff --git a/source/unres/src_MD/CMakeLists.txt b/source/unres/src_MD/CMakeLists.txt
index 46322e8..d44dcc5 100644
--- a/source/unres/src_MD/CMakeLists.txt
+++ b/source/unres/src_MD/CMakeLists.txt
@@ -161,11 +161,20 @@ 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")
 
 
@@ -217,9 +226,18 @@ 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")