resolved conflicts in: source/unres/src_MD/CMakeLists.txt

[unres.git] / source / unres / src_MD / CMakeLists.txt

diff --git a/source/unres/src_MD/CMakeLists.txt b/source/unres/src_MD/CMakeLists.txt
index aeda483..46322e8 100644 (file)
--- a/source/unres/src_MD/CMakeLists.txt
+++ b/source/unres/src_MD/CMakeLists.txt
@@ -87,6 +87,8 @@ elseif(Fortran_COMPILER_NAME STREQUAL "mpif90")
   set(UNRES_MD_SRC0 ${UNRES_MD_SRC0} prng.f )
 elseif(Fortran_COMPILER_NAME STREQUAL "f95")
   set(UNRES_MD_SRC0 ${UNRES_MD_SRC0} prng.f )
+elseif(Fortran_COMPILER_NAME STREQUAL "gfortran")
+  set(UNRES_MD_SRC0 ${UNRES_MD_SRC0} prng.f )
 else()
   set(UNRES_MD_SRC0 ${UNRES_MD_SRC0} prng_32.F )
 endif (Fortran_COMPILER_NAME STREQUAL "ifort")
@@ -159,6 +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. " )
+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} " )
 endif (Fortran_COMPILER_NAME STREQUAL "ifort")
 
 
@@ -210,6 +217,12 @@ elseif (Fortran_COMPILER_NAME STREQUAL "f95")
 elseif (Fortran_COMPILER_NAME STREQUAL "gfortran")
   # Add old gfortran flags
   set(CPPFLAGS "${CPPFLAGS} -DG77") 
+elseif (Fortran_COMPILER_NAME STREQUAL "g77")
+  # Add old gfortran flags
+  set(CPPFLAGS "${CPPFLAGS} -DG77")
+else(Fortran_COMPILER_NAME STREQUAL "ifort")
+  # Default preprocessor flag
+  set(CPPFLAGS "${CPPFLAGS} -DPGI")
 endif (Fortran_COMPILER_NAME STREQUAL "ifort")
 
 #=========================================