[Bf-blender-cvs] [888c0e55665] tmp_codesign_T90418: Fix install location

Ankit Meel noreply at git.blender.org
Tue Aug 10 05:42:25 CEST 2021


Commit: 888c0e55665a0f96725480ca96ceae14ce84fd53
Author: Ankit Meel
Date:   Tue Aug 10 09:12:18 2021 +0530
Branches: tmp_codesign_T90418
https://developer.blender.org/rB888c0e55665a0f96725480ca96ceae14ce84fd53

Fix install location

===================================================================

M	source/creator/CMakeLists.txt

===================================================================

diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 78de85307cb..a1cef1d61af 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -342,11 +342,11 @@ elseif(APPLE)
       # Keep the `BLENDER_VERSION` folder and bpy.so in the build folder.
       set(INSTALL_BPY_TO_SITE_PACKAGES OFF)
     else()
-      set(TARGETDIR_VER "${PYTHON_LIBPATH}/Resources/${BLENDER_VERSION}")
+      set(TARGETDIR_VER "${PYTHON_LIBPATH}/site-packages/Resources/${BLENDER_VERSION}")
       set(INSTALL_BPY_TO_SITE_PACKAGES ON)
     endif()
   else()
-    set(TARGETDIR_VER $<TARGET_FILE_DIR:blender>/../Resources/${BLENDER_VERSION})
+    set(TARGETDIR_VER Blender.app/Contents/Resources/${BLENDER_VERSION})
   endif()
   set(MAC_BLENDER_TARGET_DYLIBS_DIR "${TARGETDIR_VER}/lib")
   # Skip relinking on cpack / install



More information about the Bf-blender-cvs mailing list