From 6c88ad3fd694b86bbfd32b6c2c9b31e89bb7dc1a Mon Sep 17 00:00:00 2001 From: Yu Xing <30361039+xyyimian@users.noreply.github.com> Date: Tue, 27 Aug 2024 09:14:41 -0700 Subject: [PATCH] fix: resolve naming conflict while llama.cpp and sd.cpp both build (#351) --- CMakeLists.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a937744..6e624f1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -102,7 +102,10 @@ set(CMAKE_POLICY_DEFAULT_CMP0077 NEW) add_definitions(-DGGML_MAX_NAME=128) # deps -add_subdirectory(ggml) +# Only add ggml if it hasn't been added yet +if (NOT TARGET ggml) + add_subdirectory(ggml) +endif() add_subdirectory(thirdparty)