diff --git a/CMakeLists.txt b/CMakeLists.txt index 6b9b541304306..79364d372e9cb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -42,14 +42,14 @@ option(BUILD_SHARED_LIBS "build shared libraries" ${BUILD_SHARED_LIBS_DEFAULT}) # # general -option(LLAMA_CCACHE "llama: use ccache if available" ON) +option(LLAMA_CCACHE "llama: use ccache if available" ON) # debug option(LLAMA_ALL_WARNINGS "llama: enable all compiler warnings" ON) option(LLAMA_ALL_WARNINGS_3RD_PARTY "llama: enable all compiler warnings in 3rd party libs" OFF) # build -option(LLAMA_FATAL_WARNINGS "llama: enable -Werror flag" OFF) +option(LLAMA_FATAL_WARNINGS "llama: enable -Werror flag" OFF) # sanitizers option(LLAMA_SANITIZE_THREAD "llama: enable thread sanitizer" OFF) @@ -69,7 +69,6 @@ include(${CMAKE_CURRENT_SOURCE_DIR}/scripts/build-info.cmake) # override ggml options set(GGML_CCACHE ${LLAMA_CCACHE}) -set(GGML_BUILD_SHARED_LIBS ${LLAMA_BUILD_SHARED_LIBS}) set(GGML_SANITIZE_THREAD ${LLAMA_SANITIZE_THREAD}) set(GGML_SANITIZE_ADDRESS ${LLAMA_SANITIZE_ADDRESS}) set(GGML_SANITIZE_UNDEFINED ${LLAMA_SANITIZE_UNDEFINED}) diff --git a/ggml/src/CMakeLists.txt b/ggml/src/CMakeLists.txt index 84bc8e19d3d63..eeb5b1d7f047e 100644 --- a/ggml/src/CMakeLists.txt +++ b/ggml/src/CMakeLists.txt @@ -694,7 +694,7 @@ if (GGML_KOMPUTE) add_compile_definitions(GGML_USE_KOMPUTE) - set(GGML_EXTRA_LIBS ${GGML_EXTRA_LIBS} kompute) + set(GGML_EXTRA_LIBS ${GGML_EXTRA_LIBS} kompute) set(GGML_EXTRA_INCLUDES ${GGML_EXTRA_INCLUDES} ${CMAKE_BINARY_DIR}) else() message(WARNING "Kompute not found") @@ -823,14 +823,6 @@ if (GGML_CUDA) endif() endif() -if (WIN32) - add_compile_definitions(_CRT_SECURE_NO_WARNINGS) - - if (BUILD_SHARED_LIBS) - set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) - endif() -endif() - if (GGML_LTO) include(CheckIPOSupported) check_ipo_supported(RESULT result OUTPUT output) @@ -841,6 +833,7 @@ if (GGML_LTO) endif() endif() +# TODO: should not be set globally if (GGML_CCACHE) find_program(GGML_CCACHE_FOUND ccache) @@ -1098,6 +1091,15 @@ if (CMAKE_SYSTEM_NAME MATCHES "OpenBSD") add_compile_definitions(_BSD_SOURCE) endif() +# TODO: should not use this +if (WIN32) + add_compile_definitions(_CRT_SECURE_NO_WARNINGS) + + if (BUILD_SHARED_LIBS) + set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) + endif() +endif() + # # libraries # diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index eaa5045679809..ccb607e56d336 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,3 +1,12 @@ +# TODO: should not use this +if (WIN32) + add_compile_definitions(_CRT_SECURE_NO_WARNINGS) + + if (BUILD_SHARED_LIBS) + set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) + endif() +endif() + # # libraries #