untarring of Python 3.2 tarballs would fail if CMake was installed into path with...
authorNathan Letwory <nathan@letworyinteractive.com>
Thu, 10 Mar 2011 00:12:06 +0000 (00:12 +0000)
committerNathan Letwory <nathan@letworyinteractive.com>
Thu, 10 Mar 2011 00:12:06 +0000 (00:12 +0000)
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.

source/creator/CMakeLists.txt

index f22e55204f2ef34441852a2bef5b419e60b1d675..1ef86d3d8088da42a2230458815fd6783c7e1151 100644 (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
+                                       "
+                                       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
                                        "
-                                       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_d.tar.gz\")
                                        "
+                                       CONFIGURATIONS Debug
                                )
 
                                # doesnt work, todo