From 1d1811c54bacf6aa1a6adb271ed67aecc2ccc609 Mon Sep 17 00:00:00 2001 From: Sebastian Parborg Date: Thu, 21 Nov 2024 11:07:08 +0100 Subject: [PATCH] CMake: Linux/Mac: Fix CMP0177 policy warnings Follow up to: https://projects.blender.org/blender/blender/commit/536937b4d44e3707ee22b80195c1ddd5d72bbd6e Pull Request: https://projects.blender.org/blender/blender/pulls/130602 --- source/creator/CMakeLists.txt | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index b093c752215..32e624a32cf 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -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)