From 269c3dee92c85ea0a75496bd42c535ad83891695 Mon Sep 17 00:00:00 2001
From: Larry Knox <lrknox@hdfgroup.org>
Date: Thu, 12 Oct 2023 16:58:24 -0500
Subject: [PATCH] Add missing compiler flags for NVHPC without duplicating
 flags already added by cmake.

---
 config/cmake/HDFCXXCompilerFlags.cmake     | 6 ++++--
 config/cmake/HDFCompilerFlags.cmake        | 6 ++++--
 config/cmake/HDFFortranCompilerFlags.cmake | 7 +++++--
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/config/cmake/HDFCXXCompilerFlags.cmake b/config/cmake/HDFCXXCompilerFlags.cmake
index 951eded0ec8..1f4aea774be 100644
--- a/config/cmake/HDFCXXCompilerFlags.cmake
+++ b/config/cmake/HDFCXXCompilerFlags.cmake
@@ -52,9 +52,11 @@ endif ()
 if (CMAKE_CXX_COMPILER_ID STREQUAL "NVHPC")
   set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Minform=warn")
   if (NOT ${HDF_CFG_NAME} MATCHES "Debug" AND NOT ${HDF_CFG_NAME} MATCHES "Developer")
-    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O4")
+    if (${HDF_CFG_NAME} MATCHES "RelWithDebInfo")
+      set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s")
+    endif ()
   else ()
-    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Mbounds -gopt -O2")
+    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Mbounds -gopt -g")
   endif ()
 endif ()
 
diff --git a/config/cmake/HDFCompilerFlags.cmake b/config/cmake/HDFCompilerFlags.cmake
index 971fec560ac..569188c67cc 100644
--- a/config/cmake/HDFCompilerFlags.cmake
+++ b/config/cmake/HDFCompilerFlags.cmake
@@ -50,9 +50,11 @@ endif()
 if(CMAKE_C_COMPILER_ID STREQUAL "NVHPC" )
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Minform=warn")
   if (NOT ${HDF_CFG_NAME} MATCHES "Debug" AND NOT ${HDF_CFG_NAME} MATCHES "Developer")
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fast -O4")
+    if (${HDF_CFG_NAME} MATCHES "RelWithDebInfo")
+      set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -s")
+    endif ()
   else ()
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Mbounds -O2")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Mbounds -g")
   endif ()
 endif()
 
diff --git a/config/cmake/HDFFortranCompilerFlags.cmake b/config/cmake/HDFFortranCompilerFlags.cmake
index 06184a5c468..5db2704eb3b 100644
--- a/config/cmake/HDFFortranCompilerFlags.cmake
+++ b/config/cmake/HDFFortranCompilerFlags.cmake
@@ -60,9 +60,12 @@ endif ()
 if (CMAKE_Fortran_COMPILER_ID STREQUAL "NVHPC")
   set (CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fPIC")
   if (NOT ${HDF_CFG_NAME} MATCHES "Debug" AND NOT ${HDF_CFG_NAME} MATCHES "Developer")
-    set (CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fast -Mnoframe")
+    set (CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -Mnoframe")
+    if (${HDF_CFG_NAME} MATCHES "RelWithDebInfo")
+      set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -s")
+    endif ()
   else ()
-    set (CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -Mbounds -Mchkptr -Mdclchk")
+    set (CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -Mbounds -Mchkptr -Mdclchk -g")
   endif ()
 endif ()