From 499308d07962e66f3db8dc313ece3a36e4a9e67d Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 6 Jul 2015 02:25:53 +1000 Subject: [PATCH] CMake: use cmake commands where possible --- source/creator/CMakeLists.txt | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index c6674e416d9..09d85690e30 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -908,9 +908,10 @@ elseif(APPLE) add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/python - COMMAND rm -rf ${CMAKE_CURRENT_BINARY_DIR}/python/ - COMMAND mkdir ${CMAKE_CURRENT_BINARY_DIR}/python/ - COMMAND unzip -q ${LIBDIR}/release/${PYTHON_ZIP} -d ${CMAKE_CURRENT_BINARY_DIR}/python/ + COMMAND ${CMAKE_COMMAND} -E remove_directory "${CMAKE_CURRENT_BINARY_DIR}/python/" + COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_CURRENT_BINARY_DIR}/python/" + COMMAND ${CMAKE_COMMAND} -E chdir "${CMAKE_CURRENT_BINARY_DIR}/python/" + ${CMAKE_COMMAND} -E tar xzfv "${LIBDIR}/release/${PYTHON_ZIP}" DEPENDS ${LIBDIR}/release/${PYTHON_ZIP}) add_dependencies(blender extractpyzip) @@ -967,9 +968,10 @@ elseif(APPLE) if(WITH_PYTHON AND NOT WITH_PYTHON_FRAMEWORK) add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/python - COMMAND rm -rf ${CMAKE_CURRENT_BINARY_DIR}/python/ - COMMAND mkdir ${CMAKE_CURRENT_BINARY_DIR}/python/ - COMMAND unzip -q ${LIBDIR}/release/${PYTHON_ZIP} -d ${CMAKE_CURRENT_BINARY_DIR}/python/ + COMMAND ${CMAKE_COMMAND} -E remove_directory "${CMAKE_CURRENT_BINARY_DIR}/python/" + COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_CURRENT_BINARY_DIR}/python/" + COMMAND ${CMAKE_COMMAND} -E chdir "${CMAKE_CURRENT_BINARY_DIR}/python/" + ${CMAKE_COMMAND} -E tar xzfv "${LIBDIR}/release/${PYTHON_ZIP}" DEPENDS ${LIBDIR}/release/${PYTHON_ZIP}) # copy extracted python files