From: Diego Devesa <redacted>
Date: Tue, 19 Nov 2024 13:29:38 +0000 (+0100)
Subject: cuda : fix CUDA_FLAGS not being applied (llama/10403)
X-Git-Tag: upstream/1.7.4~177
X-Git-Url: https://git.djapps.eu/?a=commitdiff_plain;h=5f6d6919b4e2cff700dc7000607f62e3f80789c1;p=pkg%2Fggml%2Fsources%2Fwhisper.cpp

cuda : fix CUDA_FLAGS not being applied (llama/10403)
---

diff --git a/ggml/src/ggml-blas/CMakeLists.txt b/ggml/src/ggml-blas/CMakeLists.txt
index ffe39e8b..e2cbabf0 100644
--- a/ggml/src/ggml-blas/CMakeLists.txt
+++ b/ggml/src/ggml-blas/CMakeLists.txt
@@ -75,7 +75,6 @@ if (BLAS_FOUND)
 
     message(STATUS "BLAS found, Includes: ${BLAS_INCLUDE_DIRS}")
 
-    #add_compile_options(${BLAS_LINKER_FLAGS})
     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"))
diff --git a/ggml/src/ggml-cuda/ggml/CMakeLists.txt b/ggml/src/ggml-cuda/ggml/CMakeLists.txt
index 25858ece..e1482a26 100644
--- a/ggml/src/ggml-cuda/ggml/CMakeLists.txt
+++ b/ggml/src/ggml-cuda/ggml/CMakeLists.txt
@@ -149,7 +149,7 @@ if (CUDAToolkit_FOUND)
         list(APPEND CUDA_FLAGS -Xcompiler ${CUDA_CXX_FLAGS_JOINED})
     endif()
 
-    add_compile_options("$<$<COMPILE_LANGUAGE:CUDA>:${CUDA_FLAGS}>")
+    target_compile_options(ggml-cuda PRIVATE "$<$<COMPILE_LANGUAGE:CUDA>:${CUDA_FLAGS}>")
 else()
     message(FATAL_ERROR "CUDA Toolkit not found")
 endif()