diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-02-15 16:08:06 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-02-15 16:08:06 +0400 |
| commit | 428f031237b8ad10a7d85110857167c1d3f57415 (patch) | |
| tree | c3ebda9dd4ab5d01fe60301efd630c613819efb2 /source/creator | |
| parent | 77223492fd63f061b145b29bde5790fa1dd58c46 (diff) | |
| parent | 3ac1ad5378cbf64f823e53cff393351764e042a8 (diff) | |
svn merge ^/trunk/blender -r44076:44118
Diffstat (limited to 'source/creator')
| -rw-r--r-- | source/creator/CMakeLists.txt | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index b91080fa56e..19b3c6616ac 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -398,12 +398,21 @@ if(UNIX AND NOT APPLE) if(WITH_PYTHON) if(WITH_PYTHON_INSTALL) + # on some platforms (like openSUSE) Python is linked + # to be used from lib64 folder. + # determine this from Python's libraries path + if(${PYTHON_LIBPATH} MATCHES "lib64$") + set(_target_LIB "lib64") + else() + set(_target_LIB "lib") + endif() + # Copy the systems python into the install directory # Scons copy in tools/Blender.py # install(CODE "message(\"copying a subset of the systems python...\")") install( DIRECTORY ${PYTHON_LIBPATH}/python${PYTHON_VERSION} - DESTINATION ${TARGETDIR_VER}/python/lib + DESTINATION ${TARGETDIR_VER}/python/${_target_LIB} PATTERN ".svn" EXCLUDE PATTERN "__pycache__" EXCLUDE # * any cache * PATTERN "distutils" EXCLUDE # ./distutils @@ -421,6 +430,7 @@ if(UNIX AND NOT APPLE) # # doesnt work, todo # install(CODE "execute_process(COMMAND find ${TARGETDIR}/${BLENDER_VERSION}/python/lib/ -name '*.so' -exec strip -s {} '\;')") + unset(_target_LIB) endif() endif() elseif(WIN32) |