From e20e0ee6cd729c75939668edf167b0efd6754590 Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Sun, 12 May 2024 22:18:59 -0400 Subject: [PATCH 1/2] build(macos): skip link of nonexistent directories --- cmake/compile_definitions/macos.cmake | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/cmake/compile_definitions/macos.cmake b/cmake/compile_definitions/macos.cmake index 549ea1d0f1e..e2455bc6d51 100644 --- a/cmake/compile_definitions/macos.cmake +++ b/cmake/compile_definitions/macos.cmake @@ -2,9 +2,17 @@ add_compile_definitions(SUNSHINE_PLATFORM="macos") -link_directories(/opt/local/lib) -link_directories(/usr/local/lib) -link_directories(/opt/homebrew/lib) +set(MACOS_LINK_DIRECTORIES + /opt/homebrew/lib + /opt/local/lib + /usr/local/lib) + +foreach(DIR ${MACOS_LINK_DIRECTORIES}) + if(EXISTS ${DIR}) + link_directories(${DIR}) + endif() +endforeach() + ADD_DEFINITIONS(-DBOOST_LOG_DYN_LINK) list(APPEND SUNSHINE_EXTERNAL_LIBRARIES From 070963a12dc67cbd2292e1a4b8da7e898e9de463 Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Mon, 13 May 2024 08:57:08 -0400 Subject: [PATCH 2/2] Apply suggestions from code review --- cmake/compile_definitions/macos.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake/compile_definitions/macos.cmake b/cmake/compile_definitions/macos.cmake index e2455bc6d51..9d445869b1a 100644 --- a/cmake/compile_definitions/macos.cmake +++ b/cmake/compile_definitions/macos.cmake @@ -7,9 +7,9 @@ set(MACOS_LINK_DIRECTORIES /opt/local/lib /usr/local/lib) -foreach(DIR ${MACOS_LINK_DIRECTORIES}) - if(EXISTS ${DIR}) - link_directories(${DIR}) +foreach(dir ${MACOS_LINK_DIRECTORIES}) + if(EXISTS ${dir}) + link_directories(${dir}) endif() endforeach()