vbatts/llama.cpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix win build conflict of math library

Browse source
This commit is contained in:
luoyu-intel 2024-07-01 14:58:24 +08:00
parent d08c20edde
commit 34fce9d039
2 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CMakePresets.json
View file

@ -19,6 +19,7 @@
"cacheVariables": { "cacheVariables": {
"CMAKE_EXPORT_COMPILE_COMMANDS": "ON", "CMAKE_EXPORT_COMPILE_COMMANDS": "ON",
"CMAKE_CXX_COMPILER": "icx", "CMAKE_CXX_COMPILER": "icx",
"CMAKE_C_COMPILER": "cl",
"GGML_SYCL": "ON", "GGML_SYCL": "ON",
"CMAKE_INSTALL_RPATH": "$ORIGIN;$ORIGIN/.." "CMAKE_INSTALL_RPATH": "$ORIGIN;$ORIGIN/.."
} }

2
ggml/src/CMakeLists.txt
View file

@ -1168,8 +1168,10 @@ target_link_libraries(ggml PRIVATE Threads::Threads ${GGML_EXTRA_LIBS})
find_library(MATH_LIBRARY m) find_library(MATH_LIBRARY m)
if (MATH_LIBRARY) if (MATH_LIBRARY)
if (NOT WIN32 AND GGML_SYCL)
target_link_libraries(ggml PRIVATE ${MATH_LIBRARY}) target_link_libraries(ggml PRIVATE ${MATH_LIBRARY})
endif() endif()
endif()
if (BUILD_SHARED_LIBS) if (BUILD_SHARED_LIBS)
set_target_properties(ggml PROPERTIES POSITION_INDEPENDENT_CODE ON) set_target_properties(ggml PROPERTIES POSITION_INDEPENDENT_CODE ON)