sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

CMake: fix for msvc (take2)

Browse Source
This commit is contained in:
Campbell Barton 2014-12-01 15:36:35 +01:00
parent 3bd46904be
commit 7d88f0ce4d
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
source/creator/CMakeLists.txt Normal file → Executable file
View File

@ -632,6 +632,7 @@ elseif(WIN32)
install(
CODE
"
message(STATUS \"Extracting Python to: \${CMAKE_INSTALL_PREFIX}/${BLENDER_VERSION}/python\")
if(\"\${CMAKE_INSTALL_CONFIG_NAME}\" MATCHES \"^([Dd][Ee][Bb][Uu][Gg])$\")
set(PYTHON_ZIP ${LIBDIR}/release/python${_PYTHON_VERSION_NO_DOTS}_d.tar.gz)
else()
@ -639,20 +640,16 @@ elseif(WIN32)
endif()
execute_process(
COMMAND ${CMAKE_COMMAND} -E
make_directory \"${CMAKE_CURRENT_BINARY_DIR}/${BLENDER_VERSION}/python/lib\"
COMMAND ${CMAKE_COMMAND} -E
tar xzfv \"\${PYTHON_ZIP} -C ${CMAKE_CURRENT_BINARY_DIR}/${BLENDER_VERSION}/python/lib\"
COMMAND \${CMAKE_COMMAND} -E make_directory
\"\${CMAKE_INSTALL_PREFIX}/${BLENDER_VERSION}/python/lib\"
COMMAND \${CMAKE_COMMAND} -E
chdir \"\${CMAKE_INSTALL_PREFIX}/${BLENDER_VERSION}/python/lib\"
\${CMAKE_COMMAND} -E
tar xzfv \"\${PYTHON_ZIP}\"
)
unset(PYTHON_ZIP)
"
)
# install python
install(
DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${BLENDER_VERSION}/python/lib
DESTINATION ${BLENDER_VERSION}/python
PATTERN 'site-packages/*' EXCLUDE
)
# release/site-packages
install(
@ -672,7 +669,6 @@ elseif(WIN32)
install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${BLENDER_VERSION}/python/lib/site-packages/numpy
DESTINATION ${BLENDER_VERSION}/python/lib/site-packages)
endif()
endif()
unset(_PYTHON_VERSION_NO_DOTS)