From b027415aa4473b954abef46bec87d13b85b3192b Mon Sep 17 00:00:00 2001 From: Dawid Jagiela Date: Mon, 2 Sep 2013 17:05:23 +0200 Subject: [PATCH] resolved conflicts in: source/unres/src_MD/CMakeLists.txt --- source/unres/src_MD/CMakeLists.txt | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/source/unres/src_MD/CMakeLists.txt b/source/unres/src_MD/CMakeLists.txt index d44dcc5..46322e8 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") @@ -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") -- 1.7.9.5