Merge removing the deprecated variable in CMake gko_rename_cache

This makes sure the deprecation warnings caused by `gko_rename_cache` only appear once. Related PR: #1471
ginkgo-project · Nov 28, 2023 · f40f46d · f40f46d
2 parents 5591f99 + b16e069
commit f40f46d
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/cmake/rename.cmake b/cmake/rename.cmake
@@ -5,16 +5,18 @@ macro(gko_rename_cache deprecated actual type doc_string)
             message("actual ${actual} and deprecated ${deprecated}")
             if("${${actual}}" STREQUAL "${${deprecated}}")
                 # They are the same, so only throw warning
-                message(WARNING "${deprecated} was deprecated, please only use ${actual} instead.")
+                message(WARNING "${deprecated} was deprecated, please only use ${actual} instead. We removed the old variable.")
+                unset(${deprecated} CACHE)
             else()
                 # They are different
                 message(FATAL_ERROR "Both ${deprecated} and ${actual} were specified differently, please only use ${actual} instead.")
             endif()
         else()
             # Only set `deprecated`, move it to `actual`.
             message(WARNING "${deprecated} was deprecated, please use ${actual} instead.  "
-                "We copy ${${deprecated}} to ${actual}")
+                "We copied ${${deprecated}} to ${actual} and removed the old variable.")
             set(${actual} ${${deprecated}} CACHE ${type} "${doc_string}")
+            unset(${deprecated} CACHE)
         endif()
     endif()
-endmacro()
+endmacro()