fix win build conflict of math library

luoyu-intel · luoyu-intel · commit 34fce9d0399f · 2024-07-02T11:39:14.000+08:00
diff --git a/CMakePresets.json b/CMakePresets.json
@@ -19,6 +19,7 @@
         "cacheVariables": {
             "CMAKE_EXPORT_COMPILE_COMMANDS": "ON",
             "CMAKE_CXX_COMPILER": "icx",
+            "CMAKE_C_COMPILER": "cl",
             "GGML_SYCL": "ON",
             "CMAKE_INSTALL_RPATH": "$ORIGIN;$ORIGIN/.."
         }
diff --git a/ggml/src/CMakeLists.txt b/ggml/src/CMakeLists.txt
@@ -1168,7 +1168,9 @@ target_link_libraries(ggml PRIVATE Threads::Threads ${GGML_EXTRA_LIBS})
 
 find_library(MATH_LIBRARY m)
 if (MATH_LIBRARY)
-    target_link_libraries(ggml PRIVATE ${MATH_LIBRARY})
+    if (NOT WIN32 AND GGML_SYCL)
+        target_link_libraries(ggml PRIVATE ${MATH_LIBRARY})
+    endif()
 endif()
 
 if (BUILD_SHARED_LIBS)

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@`
`19`	`19`	`"cacheVariables": {`
`20`	`20`	`"CMAKE_EXPORT_COMPILE_COMMANDS": "ON",`
`21`	`21`	`"CMAKE_CXX_COMPILER": "icx",`
	`22`	`+ "CMAKE_C_COMPILER": "cl",`
`22`	`23`	`"GGML_SYCL": "ON",`
`23`	`24`	`"CMAKE_INSTALL_RPATH": "$ORIGIN;$ORIGIN/.."`
`24`	`25`	`}`