Merge pull request #15 from NOAA-EMC/gcc-10-settable-flags

GCC 10 flags, compiler check, and settable flags
NOAA-EMC · Aug 27, 2020 · f2db3d5 · f2db3d5
2 parents a87747b + 8dd4d72
commit f2db3d5
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -2,11 +2,11 @@
 
 if(CMAKE_Fortran_COMPILER_ID MATCHES "^(Intel)$")
   set(CMAKE_Fortran_FLAGS
-      "-g -xHOST -traceback -free -convert big_endian -assume byterecl")
+      "-g -traceback -free -convert big_endian -assume byterecl ${CMAKE_Fortran_FLAGS}")
   set(CMAKE_Fortran_FLAGS_RELEASE "-O2")
-elseif(CMAKE_Fortran_COMPILER_ID MATCHES "^(GNU|Clang|AppleClang)$")
+elseif(CMAKE_Fortran_COMPILER_ID MATCHES "^(GNU)$")
   set(CMAKE_Fortran_FLAGS
-      "-g -fbacktrace -ffree-form -fconvert=big-endian -funroll-loops")
+      "-g -fbacktrace -ffree-form -fconvert=big-endian -funroll-loops ${CMAKE_Fortran_FLAGS}")
   set(CMAKE_Fortran_FLAGS_RELEASE "-O2")
   set(CMAKE_Fortran_FLAGS_DEBUG "-ggdb -Wall")
 endif()