griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

CMake: Linux/Mac: Fix CMP0177 policy warnings

Browse Source 
Follow up to: 536937b4d4

Pull Request: https://projects.blender.org/blender/blender/pulls/130602
This commit is contained in:
Sebastian Parborg
2024-11-21 11:07:08 +01:00
committed by Sebastian Parborg
parent dbc8b29519
commit 1d1811c54b
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
source/creator/CMakeLists.txt
View File

@@ -384,9 +384,9 @@ endif()
if(UNIX AND NOT APPLE)
if(WITH_PYTHON_MODULE)
if(WITH_INSTALL_PORTABLE)
set(TARGETDIR_BPY "./bpy")
set(TARGETDIR_VER "./bpy/${BLENDER_VERSION}")
set(TARGETDIR_LIB "./bpy/lib")
set(TARGETDIR_BPY "bpy")
set(TARGETDIR_VER "bpy/${BLENDER_VERSION}")
set(TARGETDIR_LIB "bpy/lib")
else()
set(TARGETDIR_BPY ${PYTHON_SITE_PACKAGES}/bpy)
set(TARGETDIR_VER ${PYTHON_SITE_PACKAGES}/bpy/${BLENDER_VERSION})
@@ -394,12 +394,12 @@ if(UNIX AND NOT APPLE)
endif()
else()
if(WITH_INSTALL_PORTABLE)
set(TARGETDIR_VER "./${BLENDER_VERSION}")
set(TARGETDIR_VER "${BLENDER_VERSION}")
set(TARGETDIR_TEXT ".")
set(TARGETDIR_LIB "./lib")
set(TARGETDIR_LIB "lib")
else()
set(TARGETDIR_VER "./share/blender/${BLENDER_VERSION}")
set(TARGETDIR_TEXT "./share/doc/blender")
set(TARGETDIR_VER "share/blender/${BLENDER_VERSION}")
set(TARGETDIR_TEXT "share/doc/blender")
endif()
endif()
@@ -419,9 +419,9 @@ elseif(WIN32)
elseif(APPLE)
if(WITH_PYTHON_MODULE)
if(WITH_INSTALL_PORTABLE)
set(TARGETDIR_BPY "./bpy")
set(TARGETDIR_VER "./bpy/${BLENDER_VERSION}")
set(TARGETDIR_LIB "./bpy/lib")
set(TARGETDIR_BPY "bpy")
set(TARGETDIR_VER "bpy/${BLENDER_VERSION}")
set(TARGETDIR_LIB "bpy/lib")
else()
# Paths defined in terms of `site-packages` since the `site-packages`
# directory can be a symbolic-link (brew for example).
@@ -430,9 +430,9 @@ elseif(APPLE)
set(TARGETDIR_LIB ${PYTHON_SITE_PACKAGES}/bpy/lib)
endif()
else()
set(TARGETDIR_VER "./Blender.app/Contents/Resources/${BLENDER_VERSION}")
set(TARGETDIR_LIB "./Blender.app/Contents/Resources/lib")
set(TARGETDIR_TEXT "./Blender.app/Contents/Resources/text")
set(TARGETDIR_VER "Blender.app/Contents/Resources/${BLENDER_VERSION}")
set(TARGETDIR_LIB "Blender.app/Contents/Resources/lib")
set(TARGETDIR_TEXT "Blender.app/Contents/Resources/text")
endif()
# Skip re-linking on CPACK / install.
set_target_properties(blender PROPERTIES BUILD_WITH_INSTALL_RPATH true)