[Bf-blender-cvs] [0ec82477af9] master: macOS/bpy: install into site-packages
Ankit Meel
noreply at git.blender.org
Fri Mar 26 20:45:05 CET 2021
Commit: 0ec82477af9bc55e933694300ccd9666fd9534de
Author: Ankit Meel
Date: Sat Mar 27 01:14:45 2021 +0530
Branches: master
https://developer.blender.org/rB0ec82477af9bc55e933694300ccd9666fd9534de
macOS/bpy: install into site-packages
Reviewed By: #platform_macos, brecht
Maniphest Tasks: T86579
Differential Revision: https://developer.blender.org/D10664
===================================================================
M build_files/cmake/platform/platform_apple.cmake
M source/creator/CMakeLists.txt
===================================================================
diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake
index 6276032d85c..af745db63b5 100644
--- a/build_files/cmake/platform/platform_apple.cmake
+++ b/build_files/cmake/platform/platform_apple.cmake
@@ -146,7 +146,7 @@ if(WITH_PYTHON)
set(PYTHON_INCLUDE_DIR "${_py_framework}/include/python${PYTHON_VERSION}")
set(PYTHON_EXECUTABLE "${_py_framework}/bin/python${PYTHON_VERSION}")
- set(PYTHON_LIBPATH "${_py_framework}/lib/python${PYTHON_VERSION}/config-${PYTHON_VERSION}")
+ set(PYTHON_LIBPATH "${_py_framework}/lib/python${PYTHON_VERSION}/")
# set(PYTHON_LIBRARY python${PYTHON_VERSION})
# set(PYTHON_LINKFLAGS "-u _PyMac_Error -framework Python") # won't build with this enabled
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 07bc1d5d83d..43533d55f55 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -1054,6 +1054,15 @@ elseif(APPLE)
)
unset(_py_inc_suffix)
endif()
+ if(WITH_PYTHON_MODULE)
+ install(
+ TARGETS blender
+ LIBRARY DESTINATION ${PYTHON_LIBPATH}/site-packages
+ )
+ install_dir(
+ ${CMAKE_INSTALL_PREFIX}/${TARGETDIR_VER}
+ ${PYTHON_LIBPATH}/Resources)
+ endif()
if(WITH_DRACO)
install(
More information about the Bf-blender-cvs
mailing list