[Bf-blender-cvs] [499308d] master: CMake: use cmake commands where possible

[Campbell Barton]

Commit: 499308d07962e66f3db8dc313ece3a36e4a9e67d
Author: Campbell Barton
Date:   Mon Jul 6 02:25:53 2015 +1000
Branches: master
https://developer.blender.org/rB499308d07962e66f3db8dc313ece3a36e4a9e67d

CMake: use cmake commands where possible

===================================================================

M       source/creator/CMakeLists.txt

===================================================================

diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index c6674e4..09d8569 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

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs