CMake: fix for MSVC, installing Python

This commit is contained in:
Campbell Barton 2014-12-01 14:53:12 +01:00
parent 4ad0d33d69
commit 22ecceec4a

@ -628,18 +628,35 @@ elseif(WIN32)
install(DIRECTORY DESTINATION ${TARGETDIR_VER}/python) install(DIRECTORY DESTINATION ${TARGETDIR_VER}/python)
install(DIRECTORY DESTINATION ${TARGETDIR_VER}/python/lib) install(DIRECTORY DESTINATION ${TARGETDIR_VER}/python/lib)
if(\"\${CMAKE_INSTALL_CONFIG_NAME}\" STREQUAL \"Debug\") # extract python
add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${BLENDER_VERSION}/python/lib install(
COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_CURRENT_BINARY_DIR}/${BLENDER_VERSION}/python/lib" CODE
COMMAND ${CMAKE_COMMAND} -E tar xzfv "${LIBDIR}/release/python${_PYTHON_VERSION_NO_DOTS}_d.tar.gz -C ${CMAKE_CURRENT_BINARY_DIR}/${BLENDER_VERSION}/python/lib") "
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() else()
add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${BLENDER_VERSION}/python/lib set(PYTHON_ZIP ${LIBDIR}/release/python${_PYTHON_VERSION_NO_DOTS}.tar.gz)
COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_CURRENT_BINARY_DIR}/${BLENDER_VERSION}/python/lib"
COMMAND ${CMAKE_COMMAND} -E tar xzfv "${LIBDIR}/release/python${_PYTHON_VERSION_NO_DOTS}.tar.gz -C ${CMAKE_CURRENT_BINARY_DIR}/${BLENDER_VERSION}/python/lib")
endif() 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\"
)
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 # release/site-packages
install(DIRECTORY ${LIBDIR}/release/site-packages install(
DIRECTORY ${LIBDIR}/release/site-packages
DESTINATION ${BLENDER_VERSION}/python/lib DESTINATION ${BLENDER_VERSION}/python/lib
PATTERN ".svn" EXCLUDE PATTERN ".svn" EXCLUDE
PATTERN "__pycache__" EXCLUDE # * any cache * PATTERN "__pycache__" EXCLUDE # * any cache *
@ -656,11 +673,6 @@ elseif(WIN32)
DESTINATION ${BLENDER_VERSION}/python/lib/site-packages) DESTINATION ${BLENDER_VERSION}/python/lib/site-packages)
endif() endif()
install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${BLENDER_VERSION}/python/lib
DESTINATION ${BLENDER_VERSION}/python
PATTERN 'site-packages/*' EXCLUDE)
endif() endif()
unset(_PYTHON_VERSION_NO_DOTS) unset(_PYTHON_VERSION_NO_DOTS)