From 3cfa9a21635b32bfd6b57981442db340f27f59de Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 24 May 2011 18:34:07 +0000 Subject: [PATCH] cmake's install target now works for the python module on *nix. --- source/creator/CMakeLists.txt | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 1dbbf2a4e70..06b8d4decec 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -233,7 +233,11 @@ if(UNIX AND NOT APPLE) if(WITH_INSTALL_PORTABLE) set(TARGETDIR_VER ${TARGETDIR}/${BLENDER_VERSION}) else() - set(TARGETDIR_VER ${CMAKE_INSTALL_PREFIX}/share/blender/${BLENDER_VERSION}) + if(WITH_PYTHON_MODULE) + set(TARGETDIR_VER ${PYTHON_LIBPATH}/python${PYTHON_VERSION}/site-packages/${BLENDER_VERSION}) + else() + set(TARGETDIR_VER ${CMAKE_INSTALL_PREFIX}/share/blender/${BLENDER_VERSION}) + endif() endif() # important to make a clean install each time @@ -273,10 +277,25 @@ if(UNIX AND NOT APPLE) else() # main blender binary - install( - PROGRAMS ${TARGETDIR}/blender - DESTINATION ${CMAKE_INSTALL_PREFIX}/bin - ) + if(WITH_PYTHON_MODULE) + get_target_property(_module_name blender OUTPUT_NAME) + if(NOT _module_suffix) + set(_module_suffix "${SUFFIX}") + endif() + + install( + PROGRAMS "${TARGETDIR}/${_module_name}.so" # XXX, *nix only + DESTINATION ${PYTHON_LIBPATH}/python${PYTHON_VERSION}/site-packages + ) + + unset(_module_name) + else() + install( + PROGRAMS ${TARGETDIR}/blender + DESTINATION ${CMAKE_INSTALL_PREFIX}/bin + ) + endif() + if(WITH_GAMEENGINE AND WITH_PLAYER) install(