Commit 5922450f for whisper.cpp
commit 5922450fbce1ed9d1648babd0d5ac4520055b436
Author: AMIR <127450356+amirthn6533@users.noreply.github.com>
Date: Fri Nov 13 09:04:38 2026 +0200
cmake : propagate deprecated options and fix math library check on Windows (#4140) (#4168)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c8a08468..93192e72 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -128,12 +128,13 @@ set(GGML_ALL_WARNINGS ${WHISPER_ALL_WARNINGS})
set(GGML_FATAL_WARNINGS ${WHISPER_FATAL_WARNINGS})
# transition helpers
-function (whisper_option_depr TYPE OLD NEW)
- if (${OLD})
+macro (whisper_option_depr TYPE OLD NEW)
+ if (DEFINED ${OLD})
message(${TYPE} "${OLD} is deprecated and will be removed in the future.\nUse ${NEW} instead\n")
- set(${NEW} ON)
+ set(${NEW} ${${OLD}} CACHE BOOL "" FORCE)
+ unset(${OLD} CACHE)
endif()
-endfunction()
+endmacro()
whisper_option_depr(FATAL_ERROR WHISPER_CUBLAS GGML_CUDA)
whisper_option_depr(WARNING WHISPER_CUDA GGML_CUDA)
diff --git a/ggml/src/CMakeLists.txt b/ggml/src/CMakeLists.txt
index fe001a04..42a7624e 100644
--- a/ggml/src/CMakeLists.txt
+++ b/ggml/src/CMakeLists.txt
@@ -621,7 +621,7 @@ endforeach()
target_link_libraries(ggml-base PRIVATE Threads::Threads)
-if (DEFINED MATH_LIBRARY)
+if (MATH_LIBRARY)
target_link_libraries(ggml-base PRIVATE ${MATH_LIBRARY})
elseif (NOT WIN32 AND NOT DEFINED ENV{ONEAPI_ROOT})
target_link_libraries(ggml-base PRIVATE m)