Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2015-07-05 19:25:53 +0300
committerCampbell Barton <ideasman42@gmail.com>2015-07-06 06:34:32 +0300
commit499308d07962e66f3db8dc313ece3a36e4a9e67d (patch)
tree4bdef2fb2c866d010fd00a4be6a6c5acc63b0842 /source/creator/CMakeLists.txt
parent15c301f533ffbda2f6ea85dbdcafec5a3431bdc4 (diff)
CMake: use cmake commands where possible
Diffstat (limited to 'source/creator/CMakeLists.txt')
-rw-r--r--source/creator/CMakeLists.txt14
1 files 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