Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

untarring of Python 3.2 tarballs would fail if CMake was installed into path with spaces. Slightly

Browse Source 
change how the extraction commands are presented (old BUILD_TYPE was empty all the time here) and
ensure also that python/lib subdir under versioned dir gets actually created.
This commit is contained in:
Nathan Letwory
2011-03-10 00:12:06 +00:00
parent 17564249bb
commit 4ef2d32b72
1 changed files with 32 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
source/creator/CMakeLists.txt
View File

@@ -413,27 +413,46 @@ if(WITH_INSTALL)
if(WITH_PYTHON_INSTALL)
#~ # note, as far as python is concerned 'RelWithDebInfo' is not debug since its without debug flags.
# install(CODE "message(\"copying a subset of the systems python...\")")
# create the directory in multiple steps, so it actually gets created when it doesn't exist yet
install(CODE "
message(\"creating ${TARGETDIR_VER}/python/lib\")
file(MAKE_DIRECTORY ${TARGETDIR_VER}/python/)
file(MAKE_DIRECTORY ${TARGETDIR_VER}/python/lib/)
message(\"done creating dir\")
")
install(
CODE
"execute_process(COMMAND ${CMAKE_COMMAND}
-E make_directory ${TARGETDIR_VER}/python/lib/)"
"
execute_process(COMMAND \"${CMAKE_COMMAND}\" -E chdir \"${TARGETDIR_VER}/python/lib/\"
COMMAND \"${CMAKE_COMMAND}\" -E tar xzfv \"${LIBDIR}/release/python32.tar.gz\")
"
CONFIGURATIONS Release
)
install(
CODE
"
if(BUILD_TYPE MATCHES \"Debug\")
set(PYBUNDLE \"python32_d.tar.gz\")
else()
set(PYBUNDLE \"python32.tar.gz\")
endif()
execute_process(COMMAND ${CMAKE_COMMAND}
-E chdir ${TARGETDIR_VER}/python/lib/
${CMAKE_COMMAND} -E tar xzfv ${LIBDIR}/release/\${PYBUNDLE})
execute_process(COMMAND \"${CMAKE_COMMAND}\" -E chdir \"${TARGETDIR_VER}/python/lib/\"
COMMAND \"${CMAKE_COMMAND}\" -E tar xzfv \"${LIBDIR}/release/python32.tar.gz\")
"
CONFIGURATIONS RelWithDebInfo
)
install(
CODE
"
execute_process(COMMAND \"${CMAKE_COMMAND}\" -E chdir \"${TARGETDIR_VER}/python/lib/\"
COMMAND \"${CMAKE_COMMAND}\" -E tar xzfv \"${LIBDIR}/release/python32.tar.gz\")
"
CONFIGURATIONS MinSizeRel
)
install(
CODE
"
execute_process(COMMAND \"${CMAKE_COMMAND}\" -E chdir \"${TARGETDIR_VER}/python/lib/\"
COMMAND \"${CMAKE_COMMAND}\" -E tar xzfv \"${LIBDIR}/release/python32_d.tar.gz\")
"
CONFIGURATIONS Debug
)
# doesnt work, todo