sync : whisper.cpp (#1359)

* ggml : Fix MKL detection by quoting BLAS_INCLUDE_DIRS (whisper/3426)

* sync : whisper.cpp

diff --git a/scripts/sync-whisper.last b/scripts/sync-whisper.last
index 732fa2afaa485451b35f144ec3c8ce3834813217..2686dd209da7b3ab6857da513214c62005e1faff 100644 (file)
--- a/scripts/sync-whisper.last
+++ b/scripts/sync-whisper.last
@@ -1 +1 @@
-fc45bb86251f774ef817e89878bb4c2636c8a58f
+22c12ee86deb317925ae7fc49d38b3634fc8f3ec

diff --git a/src/ggml-blas/CMakeLists.txt b/src/ggml-blas/CMakeLists.txt
index 76064c3fd1fe828fc29bd8b1fe4b3c964c5dcffd..60ce4b1e02c1c7f292202c6015c2cb2ab373ae1d 100644 (file)
--- a/src/ggml-blas/CMakeLists.txt
+++ b/src/ggml-blas/CMakeLists.txt
@@ -74,7 +74,7 @@ if (BLAS_FOUND)
 
     target_compile_options(ggml-blas PRIVATE ${BLAS_LINKER_FLAGS})
 
-    if (${BLAS_INCLUDE_DIRS} MATCHES "mkl" AND (${GGML_BLAS_VENDOR} MATCHES "Generic" OR ${GGML_BLAS_VENDOR} MATCHES "Intel"))
+    if ("${BLAS_INCLUDE_DIRS}" MATCHES "mkl" AND (${GGML_BLAS_VENDOR} MATCHES "Generic" OR ${GGML_BLAS_VENDOR} MATCHES "Intel"))
         add_compile_definitions(GGML_BLAS_USE_MKL)
     endif()