Conflict resolution

Author: peardox

ggml/CMakeLists.txt

@@ -362,19 +362,17 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ggml-config.cmake
         DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/ggml)
 
 ### The following breaks GGML_CPU_ALL_VARIANTS ###
-if(NOT DEFINED GGML_CPU_ALL_VARIANTS)
-    if (MSVC)
-        set(MSVC_WARNING_FLAGS
-            /wd4005  # Macro redefinition
-            /wd4244  # Conversion from one type to another type, possible loss of data
-            /wd4267  # Conversion from 'size_t' to a smaller type, possible loss of data
-        )
-        function(disable_msvc_warnings target_name)
-            target_compile_options(${target_name} PRIVATE ${MSVC_WARNING_FLAGS})
-        endfunction()
-
-        disable_msvc_warnings(ggml-base)
-        disable_msvc_warnings(ggml)
-        disable_msvc_warnings(ggml-cpu)
-    endif()
+if (MSVC AND NOT DEFINED GGML_CPU_ALL_VARIANTS)
+    set(MSVC_WARNING_FLAGS
+        /wd4005  # Macro redefinition
+        /wd4244  # Conversion from one type to another type, possible loss of data
+        /wd4267  # Conversion from 'size_t' to a smaller type, possible loss of data
+    )
+    function(disable_msvc_warnings target_name)
+        target_compile_options(${target_name} PRIVATE ${MSVC_WARNING_FLAGS})
+    endfunction()
+
+    disable_msvc_warnings(ggml-base)
+    disable_msvc_warnings(ggml)
+    disable_msvc_warnings(ggml-cpu)
 endif()