Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2015-06-10 11:39:57 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2015-06-10 11:41:06 +0300
commit73a104b8e86c45912ad99ea349c296e502811584 (patch)
treede42af8111d86b42c7da4dacdcb194288b041bae /source/creator
parent9f911f62dcefd3ce4312bb8aa1d522cae6bbf6e9 (diff)
Fix T44968: Python executable crashes due to missing .DLL
For now we work this around by copying python DLL to the bin folder. Ideally the DLL should be shared between blender and python, but that's a bit tricky to do on windows.
Diffstat (limited to 'source/creator')
-rw-r--r--source/creator/CMakeLists.txt13
1 files changed, 13 insertions, 0 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index eb912775639..1b2dd216904 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -679,6 +679,19 @@ elseif(WIN32)
install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${BLENDER_VERSION}/python/lib/site-packages/numpy
DESTINATION ${BLENDER_VERSION}/python/lib/site-packages)
endif()
+
+
+ # TODO(sergey): For unti we've got better way to deal with python binary
+ install(
+ FILES ${LIBDIR}/python/lib/python${_PYTHON_VERSION_NO_DOTS}.dll
+ DESTINATION ${BLENDER_VERSION}/python/bin
+ CONFIGURATIONS Release;RelWithDebInfo;MinSizeRel
+ )
+ install(
+ FILES ${LIBDIR}/python/lib/python${_PYTHON_VERSION_NO_DOTS}_d.dll
+ DESTINATION ${BLENDER_VERSION}/python/bin
+ CONFIGURATIONS Debug
+ )
endif()
unset(_PYTHON_VERSION_NO_DOTS)