diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-12-01 17:36:35 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-12-01 17:36:35 +0300 |
| commit | 7d88f0ce4d2184ad7ee51c01babce4a76935de75 (patch) | |
| tree | 1ccc51f7ad37c22ae9d4f64d5e7c6a31dc230754 /source/creator | |
| parent | 3bd46904beaab00e06fde99c37c2e5946a4f4a7c (diff) | |
CMake: fix for msvc (take2)
Diffstat (limited to 'source/creator')
| -rwxr-xr-x[-rw-r--r--] | source/creator/CMakeLists.txt | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 6903ab8fccc..3b41b949114 100644..100755 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -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) |