diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2a922fdb3..4a47a8a08 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -767,9 +767,10 @@ endif()
 set(CUDA_CXX_FLAGS "")
 
 if (LLAMA_CUBLAS)
-    set(CUDA_FLAGS ${CXX_FLAGS} -use_fast_math)
+    set(CUDA_FLAGS -use_fast_math)
+    list(APPEND CUDA_CXX_FLAGS ${CXX_FLAGS})
     if (NOT MSVC)
-        list(APPEND CUDA_FLAGS -Wno-pedantic)
+        list(APPEND CUDA_CXX_FLAGS -Wno-pedantic)
     endif()
 
     if (LLAMA_ALL_WARNINGS AND NOT MSVC)