diff --git a/cmake/SetBuildOptions.cmake b/cmake/SetBuildOptions.cmake
index c6b932369c..0302c44366 100644
--- a/cmake/SetBuildOptions.cmake
+++ b/cmake/SetBuildOptions.cmake
@@ -44,6 +44,14 @@ elseif(COMPILER STREQUAL "Intel" OR COMPILER STREQUAL "IntelLLVM")
       set(CMAKE_Fortran_FLAGS_DEBUG "-O0 -g -fpe0 -check all")
     endif()
     set(CMAKE_Fortran_FLAGS_RELEASE "-O2 -debug minimal")
+elseif(COMPILER STREQUAL "NVHPC")
+    add_compile_definitions(CPRNVHPC)
+    set(CMAKE_C_FLAGS "-fPIC")
+    set(CMAKE_C_FLAGS_DEBUG "-g -O0")
+    set(CMAKE_C_FLAGS_RELEASE "-Ofast")
+    set(CMAKE_Fortran_FLAGS "-fPIC")
+    set(CMAKE_Fortran_FLAGS_DEBUG "-g -O0")
+    set(CMAKE_Fortran_FLAGS_RELEASE "-Ofast") 
 else()
     message(FATAL_ERROR "COMPILER='${COMPILER}' is not supported.")
 endif()
@@ -69,4 +77,4 @@ message(STATUS " ******* ${CMAKE_PROJECT_NAME} build options ******* ")
 message(STATUS " Build type = '${CMAKE_BUILD_TYPE}'")
 message(STATUS " Compiler = '${COMPILER}'")
 message(STATUS " Coupling mode = '${COUPLING_MODE}'")
-message(STATUS " ********************************** ")
\ No newline at end of file
+message(STATUS " ********************************** ")
diff --git a/src/clm5/CMakeLists.txt b/src/clm5/CMakeLists.txt
index 0e32f30af5..2e7cca16ab 100644
--- a/src/clm5/CMakeLists.txt
+++ b/src/clm5/CMakeLists.txt
@@ -324,4 +324,4 @@ if(LAPACK_FOUND)
     target_link_libraries(${PROJECT_NAME} PRIVATE LAPACK::LAPACK)
 endif()
 target_link_libraries(${PROJECT_NAME} PRIVATE csm_share)
-install (TARGETS ${PROJECT_NAME} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
\ No newline at end of file
+install (TARGETS ${PROJECT_NAME} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})