Merge branch 'blender-v4.0-release' into main

2023-11-01 18:41:16 +01:00
parent 90269dfe14 39f7411065
commit 682bdf3110
1 changed files with 3 additions and 1 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -517,7 +517,9 @@ else()
  set(WITH_INPUT_IME OFF)
 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