From c7dca8cfeed1b305a913ec3d26c4929720e43595 Mon Sep 17 00:00:00 2001 From: casey langen Date: Sun, 19 Mar 2023 11:42:52 -0700 Subject: [PATCH] Add some homebrew workarounds to build scripts. --- CMakeLists.txt | 14 ++++++++------ src/musikcube/CMakeLists.txt | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 45c1aedda..8cbb04f02 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,12 +27,14 @@ include(ConfigureCurses) include(ConfigureCompilerFlags) include(FindVendorLibrary) -find_program(CCACHE_FOUND ccache) -if (CCACHE_FOUND) - message(STATUS "${BoldGreen}[ccache] ccache enabled!${ColorReset}") - set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache) - set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache) -endif(CCACHE_FOUND) +if (NOT DEFINED ENV{HOMEBREW_PREFIX}) + find_program(CCACHE_FOUND ccache) + if (CCACHE_FOUND) + message(STATUS "${BoldGreen}[ccache] ccache enabled!${ColorReset}") + set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache) + set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache) + endif(CCACHE_FOUND) +endif() if (CROSS_COMPILE_SYSROOT) message(STATUS "[cross-compile] enabled, rooted at: ${CROSS_COMPILE_SYSROOT}") diff --git a/src/musikcube/CMakeLists.txt b/src/musikcube/CMakeLists.txt index 46d1532fe..2156d55f0 100644 --- a/src/musikcube/CMakeLists.txt +++ b/src/musikcube/CMakeLists.txt @@ -98,7 +98,7 @@ else() endif() if (APPLE) - if (NOT DEFINED ENV{NIX_CC}) + if ((NOT DEFINED ENV{NIX_CC}) AND (NOT ${DISABLE_STATIC_NCURSES} MATCHES "true")) message(STATUS "[ncurses] detected Darwin, linking statically") set(CURSES_LIBRARY_NAME "lib${CURSES_LIBRARY_NAME}.a") set(PANEL_LIBRARY_NAME "lib${PANEL_LIBRARY_NAME}.a")