[Bf-blender-cvs] [6862caea5e8] master: macOS/bpy module: install text files correctly
Ankit Meel
noreply at git.blender.org
Wed Feb 16 21:03:30 CET 2022
Commit: 6862caea5e878ab5de22513fb9ca13e17add8919
Author: Ankit Meel
Date: Thu Feb 17 01:30:51 2022 +0530
Branches: master
https://developer.blender.org/rB6862caea5e878ab5de22513fb9ca13e17add8919
macOS/bpy module: install text files correctly
Instead of Blender.app (despite building bpy), install license etc in
`Resources/text` of bpy install location. Part of D14111
===================================================================
M source/creator/CMakeLists.txt
===================================================================
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 6a1d5b78611..d17afad0918 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -334,6 +334,8 @@ elseif(APPLE)
else()
set(TARGETDIR_VER Blender.app/Contents/Resources/${BLENDER_VERSION})
endif()
+ # License, copyright, readme files.
+ set(BLENDER_TEXT_FILES_DESTINATION "${TARGETDIR_VER}/../text")
set(MAC_BLENDER_TARGET_DYLIBS_DIR "${TARGETDIR_VER}/lib")
# Skip relinking on cpack / install
set_target_properties(blender PROPERTIES BUILD_WITH_INSTALL_RPATH true)
@@ -1057,9 +1059,6 @@ elseif(APPLE)
DESTINATION "."
)
- # install release and app files
- set(BLENDER_TEXT_FILES_DESTINATION Blender.app/Contents/Resources/text)
-
install(
FILES ${OSX_APP_SOURCEDIR}/Contents/PkgInfo
DESTINATION Blender.app/Contents
More information about the Bf-blender-cvs
mailing list