From 39f74110651e5ff3a3d9cf87a5959ef879bd6b25 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Wed, 1 Nov 2023 18:28:53 +0100 Subject: [PATCH] Fix "make bpy" on macOS not install libraries inside bpy module Default to WITH_PORTABLE_INSTALL behavior for this case, same as on Windows and Linux. --- CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0c3f026bc52..212aa7dffd4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -522,7 +522,9 @@ if(WIN32 OR APPLE) option(WITH_INPUT_IME "Enable Input Method Editor (IME) for complex Asian character input" ON) endif() option(WITH_INPUT_NDOF "Enable NDOF input devices (SpaceNavigator and friends)" ON) -if(UNIX AND NOT APPLE) +# On Windows and for the Blender application on macOS, portable install +# is the only supported installation type, so there is no option. +if(UNIX AND (NOT APPLE OR WITH_PYTHON_MODULE)) option(WITH_INSTALL_PORTABLE "\ Install redistributable runtime, otherwise install into CMAKE_INSTALL_PREFIX" ON