Commit: 493f9b915536a34e05068d2941dfa690d70b32af Author: Chad Fraleigh Date: Sun Aug 16 14:32:14 2015 +0200 Branches: master https://developer.blender.org/rB493f9b915536a34e05068d2941dfa690d70b32af
Fix for numpy with nmake and missing directory When using the nmake generator from cmake, numpy fails to extract during build because the working directory doesn't exist yet. Reviewers: juicyfruit Differential Revision: https://developer.blender.org/D1466 =================================================================== M source/creator/CMakeLists.txt =================================================================== diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 5930fd3..a358917 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -678,9 +678,13 @@ elseif(WIN32) ) if(WITH_PYTHON_INSTALL_NUMPY) + add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${BLENDER_VERSION}/python/lib/site-packages + COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/${BLENDER_VERSION}/python/lib/site-packages) + add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${BLENDER_VERSION}/python/lib/site-packages/numpy COMMAND ${CMAKE_COMMAND} -E tar xzvf "${LIBDIR}/release/python${_PYTHON_VERSION_NO_DOTS}_numpy_1.9.tar.gz" DEPENDS ${LIBDIR}/release/python${_PYTHON_VERSION_NO_DOTS}_numpy_1.9.tar.gz + ${CMAKE_CURRENT_BINARY_DIR}/${BLENDER_VERSION}/python/lib/site-packages WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${BLENDER_VERSION}/python/lib/site-packages) add_custom_target(python_numpy ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${BLENDER_VERSION}/python/lib/site-packages/numpy) install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${BLENDER_VERSION}/python/lib/site-packages/numpy _______________________________________________ Bf-blender-cvs mailing list [email protected] http://lists.blender.org/mailman/listinfo/bf-blender-cvs
