Update CMakeLists.txt - Fix source for ggml-cpu (#1474)

* Update CMakeLists.txt - Fix source for ggml-cpu

* Fixes std::min

adding compile define NOMINMAX seems to fix the further compile issues
This commit is contained in:
askmyteapot 2025-04-10 18:58:12 +10:00 committed by GitHub
parent 8acec907bb
commit e2fefc373f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -65,6 +65,7 @@ find_package(Threads REQUIRED)
add_compile_definitions(LOG_DISABLE_LOGS) add_compile_definitions(LOG_DISABLE_LOGS)
add_compile_definitions(GGML_USE_CPU) add_compile_definitions(GGML_USE_CPU)
add_compile_definitions(GGML_USE_CPU_AARCH64) add_compile_definitions(GGML_USE_CPU_AARCH64)
add_compile_definitions(NOMINMAX)
if (MSVC) if (MSVC)
add_compile_options("$<$<COMPILE_LANGUAGE:C>:/utf-8>") add_compile_options("$<$<COMPILE_LANGUAGE:C>:/utf-8>")
@ -423,11 +424,11 @@ add_library(ggml
ggml/src/ggml-cpu/binary-ops.cpp ggml/src/ggml-cpu/binary-ops.cpp
ggml/src/ggml-cpu/unary-ops.h ggml/src/ggml-cpu/unary-ops.h
ggml/src/ggml-cpu/unary-ops.cpp ggml/src/ggml-cpu/unary-ops.cpp
ggml-cpu/simd-mappings.h ggml/src/ggml-cpu/simd-mappings.h
ggml-cpu/vec.h ggml/src/ggml-cpu/vec.h
ggml-cpu/vec.cpp ggml/src/ggml-cpu/vec.cpp
ggml-cpu/ops.h ggml/src/ggml-cpu/ops.h
ggml-cpu/ops.cpp ggml/src/ggml-cpu/ops.cpp
ggml/src/ggml-backend-reg.cpp ggml/src/ggml-backend-reg.cpp
ggml/include/gguf.h ggml/include/gguf.h
ggml/src/gguf.cpp ggml/src/gguf.cpp