From 794df958f691068293e3bcf952d195b6d9b52df8 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Mon, 6 May 2024 19:08:11 +0200 Subject: [PATCH] Build: Explicitly specify Homebrew Bison path on macOS for libs To avoid using the too old system version. --- build_files/build_environment/cmake/osl.cmake | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/build_files/build_environment/cmake/osl.cmake b/build_files/build_environment/cmake/osl.cmake index 7277b102158..2038210dba2 100644 --- a/build_files/build_environment/cmake/osl.cmake +++ b/build_files/build_environment/cmake/osl.cmake @@ -7,8 +7,18 @@ if(WIN32) set(OSL_FLEX_BISON -DFLEX_EXECUTABLE=${LIBDIR}/flexbison/win_flex.exe -DBISON_EXECUTABLE=${LIBDIR}/flexbison/win_bison.exe) else() set(OSL_CMAKE_CXX_STANDARD_LIBRARIES) - set(OSL_FLEX_BISON) set(OSL_OPENIMAGEIO_LIBRARY "${LIBDIR}/openimageio/lib/OpenImageIO${SHAREDLIBEXT};${LIBDIR}/png/lib/${LIBPREFIX}png16${LIBEXT};${LIBDIR}/jpeg/lib/${LIBPREFIX}jpeg${LIBEXT};${LIBDIR}/tiff/lib/${LIBPREFIX}tiff${LIBEXT};${LIBDIR}/openexr/lib/IlmImf${OPENEXR_VERSION_POSTFIX}${SHAREDLIBEXT}") + + if(APPLE) + # Explicitly specify Homebrew path, so we don't use the old system one. + if(BLENDER_PLATFORM_ARM) + set(OSL_FLEX_BISON -DBISON_EXECUTABLE=/opt/homebrew/opt/bison/bin/bison) + else() + set(OSL_FLEX_BISON -DBISON_EXECUTABLE=/usr/local/opt/bison/bin/bison) + endif() + else() + set(OSL_FLEX_BISON) + endif() endif() set(OSL_EXTRA_ARGS