Merge pull request #162 from Goddard-Fortran-Ecosystem/develop

Develop
Goddard-Fortran-Ecosystem · Mar 23, 2022 · 2453d80 · 2453d80
2 parents cc33ac7 + e459ca2
commit 2453d80
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 22 deletions.
diff --git a/ChangeLog.MD b/ChangeLog.MD
@@ -8,6 +8,10 @@
 
 - NVHPC compiler support
 
+### Removed
+
+- Removed `PGI.mk` and `NAG.mk` files which seem to be unneeded cruft
+
 ## [1.5.5] - 2022-03-07
 
 

diff --git a/cmake/NAG.mk b/cmake/NAG.mk
diff --git a/cmake/NVHPC.cmake b/cmake/NVHPC.cmake
@@ -0,0 +1,9 @@
+# Compiler specific flags for NVIDIA Fortran compiler
+
+set(traceback "-traceback")
+set(check_all "-Mbounds -Mchkstk")
+
+set(CMAKE_Fortran_FLAGS_DEBUG  "-O0")
+set(CMAKE_Fortran_FLAGS_RELEASE "-O3")
+set(CMAKE_Fortran_FLAGS "-g ${traceback} ${check_all} -Mallocatable=03")
+
diff --git a/cmake/PGI.cmake b/cmake/PGI.cmake
@@ -1,8 +1,7 @@
 # Compiler specific flags for PGI Fortran compiler
-# (or is this now NVIDIA?)
 
 set(traceback "-traceback")
-set(check_all "-Mbounds -Mchkfpstk -Mchkstk")
+set(check_all "-Mbounds -Mchkstk")
 
 set(CMAKE_Fortran_FLAGS_DEBUG  "-O0")
 set(CMAKE_Fortran_FLAGS_RELEASE "-O3")

diff --git a/cmake/PGI.mk b/cmake/PGI.mk