From e2311a145cd9a59df0e0473c193d6cb8f3b2f885 Mon Sep 17 00:00:00 2001 From: Chris Natale Date: Sat, 30 Dec 2023 03:37:26 -0800 Subject: [PATCH] Fix: Set proper Homebrew install location for x86 Macs (#1510) * set proper Homebrew install location for x86 Macs * fix: remove prior conditional that my logic replaces --- backend/cpp/llama/CMakeLists.txt | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/backend/cpp/llama/CMakeLists.txt b/backend/cpp/llama/CMakeLists.txt index 7bf17871cc8..7caa10cda48 100644 --- a/backend/cpp/llama/CMakeLists.txt +++ b/backend/cpp/llama/CMakeLists.txt @@ -17,9 +17,17 @@ cmake_minimum_required(VERSION 3.15) set(TARGET grpc-server) set(_PROTOBUF_LIBPROTOBUF libprotobuf) set(_REFLECTION grpc++_reflection) + if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") - link_directories("/opt/homebrew/lib") - include_directories("/opt/homebrew/include") + # Set correct Homebrew install folder for Apple Silicon and Intel Macs + if (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "arm64") + set(HOMEBREW_DEFAULT_PREFIX "/opt/homebrew") + else() + set(HOMEBREW_DEFAULT_PREFIX "/usr/local") + endif() + + link_directories("${HOMEBREW_DEFAULT_PREFIX}/lib") + include_directories("${HOMEBREW_DEFAULT_PREFIX}/include") endif() find_package(absl CONFIG REQUIRED)