Merge branch 'develop' into cmake/lapack-target

LLNL · Aug 6, 2024 · b54a400 · b54a400
2 parents f82145a + 115914d
commit b54a400
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,9 @@
 
 Fixed the loading of ARKStep's default first order explicit method.
 
+Fixed a CMake bug regarding usage of missing "print_warning" macro
+that was only triggered when the deprecated `CUDA_ARCH` option was used.
+
 ### Deprecation Notices
 
 ## Changes to SUNDIALS in release 7.1.1

diff --git a/cmake/SundialsDeprecated.cmake b/cmake/SundialsDeprecated.cmake
@@ -180,8 +180,8 @@ endif()
 #
 
 if(DEFINED CUDA_ARCH)
-  print_warning("The CMake option CUDA_ARCH is deprecated. "
-                "Use CMAKE_CUDA_ARCHITECTURES instead.")
+  message(DEPRECATION "The CMake option CUDA_ARCH is deprecated. "
+                      "Use CMAKE_CUDA_ARCHITECTURES instead.")
   # convert sm_** to just **
   string(REGEX MATCH "[0-9]+" arch_name "${CUDA_ARCH}")
   set(CMAKE_CUDA_ARCHITECTURES

diff --git a/doc/shared/RecentChanges.rst b/doc/shared/RecentChanges.rst
@@ -6,4 +6,7 @@
 
 Fixed the loading of ARKStep's default first order explicit method.
 
+Fixed a CMake bug regarding usage of missing "print_warning" macro
+that was only triggered when the deprecated ``CUDA_ARCH`` option was used.
+
 **Deprecation Notices**