From: Vladimir Vuksanovic Date: Thu, 27 Feb 2025 07:42:48 +0000 (+0100) Subject: cmake: Fix ggml backend dependencies and installation (llama/11818) X-Git-Tag: upstream/1.7.4+203~29 X-Git-Url: https://git.djapps.eu/?a=commitdiff_plain;h=8255a830a8db0ce253725f7c7057108e82480b8c;p=pkg%2Fggml%2Fsources%2Fwhisper.cpp cmake: Fix ggml backend dependencies and installation (llama/11818) * Fix dependencies between ggml and backends ggml backends link only to ggml-base and ggml links to all backends. * Fix installation of ggml backends Set up GNUInstallDirs before setting the installation directory of ggml backends --- diff --git a/ggml/CMakeLists.txt b/ggml/CMakeLists.txt index 2ac18e65..359f9851 100644 --- a/ggml/CMakeLists.txt +++ b/ggml/CMakeLists.txt @@ -212,6 +212,8 @@ set(THREADS_PREFER_PTHREAD_FLAG ON) find_package(Threads REQUIRED) +include(GNUInstallDirs) + # # build the library # @@ -235,7 +237,6 @@ endif () # install # -include(GNUInstallDirs) include(CMakePackageConfigHelpers) # all public headers