Merge branch 'master' into blender2.8
[blender.git] / source / creator / CMakeLists.txt
index 11e22fffa4d88d51169aeae724e48e98a3b1d1f0..023d04f5da7a95e36957bd182e5cd260ea5f09d1 100644 (file)
@@ -851,6 +851,13 @@ elseif(APPLE)
                        PATTERN "__MACOSX" EXCLUDE
                        PATTERN ".DS_Store" EXCLUDE
                        PATTERN "config-${PYTHON_VERSION}m/*.a" EXCLUDE  # static lib
+                       PATTERN "lib2to3" EXCLUDE                   # ./lib2to3
+                       PATTERN "tkinter" EXCLUDE                   # ./tkinter
+                       PATTERN "lib-dynload/_tkinter.*" EXCLUDE    # ./lib-dynload/_tkinter.co
+                       PATTERN "idlelib" EXCLUDE                   # ./idlelib
+                       PATTERN "test" EXCLUDE                      # ./test
+                       PATTERN "turtledemo" EXCLUDE                # ./turtledemo
+                       PATTERN "turtle.py" EXCLUDE                 # ./turtle.py
                )
        endmacro()
 
@@ -914,41 +921,49 @@ elseif(APPLE)
 
        # python
        if(WITH_PYTHON AND NOT WITH_PYTHON_MODULE AND NOT WITH_PYTHON_FRAMEWORK)
-               # the python zip is first extracted as part of the build process,
-               # and then later installed as part of make install. this is much
-               # quicker, and means we can easily exclude files on copy
-               # Not needed for PYTHON_MODULE or WEB_PLUGIN due uses Pyhon framework
-               # use a hash of the .zip path to handle switching between different
-               # lib directories without needing a clean build
-               string(SHA1 PYTHON_ZIP_HASH ${LIBDIR}/release/${PYTHON_ZIP})
-               set(PYTHON_EXTRACT_DIR ${CMAKE_CURRENT_BINARY_DIR}/${PYTHON_ZIP_HASH}/python)
-
-               add_custom_target(
-                       extractpyzip
-                       DEPENDS ${PYTHON_EXTRACT_DIR})
-
-               set(PYTHON_ZIP "python_${CMAKE_OSX_ARCHITECTURES}.zip")
-
-               add_custom_command(
-                       OUTPUT ${PYTHON_EXTRACT_DIR}
-                       COMMAND ${CMAKE_COMMAND} -E remove_directory "${PYTHON_EXTRACT_DIR}/"
-                       COMMAND ${CMAKE_COMMAND} -E make_directory "${PYTHON_EXTRACT_DIR}/"
-                       COMMAND ${CMAKE_COMMAND} -E chdir "${PYTHON_EXTRACT_DIR}/"
-                               ${CMAKE_COMMAND} -E tar xzfv "${LIBDIR}/release/${PYTHON_ZIP}"
-                       DEPENDS ${LIBDIR}/release/${PYTHON_ZIP})
-
-               add_dependencies(blender extractpyzip)
-
-               # copy extracted python files
-               install_dir(
-                       ${PYTHON_EXTRACT_DIR}
-                       \${TARGETDIR_VER}
-               )
-               # copy site-packages files
-               install_dir(
-                       ${LIBDIR}/release/site-packages
-                       \${TARGETDIR_VER}/python/lib/python${PYTHON_VERSION}
-               )
+               if(WITH_CXX11)
+                       # Copy the python libs into the install directory
+                       install_dir(
+                               ${PYTHON_LIBPATH}
+                               ${TARGETDIR_VER}/python/lib
+                       )
+               else()
+                       # the python zip is first extracted as part of the build process,
+                       # and then later installed as part of make install. this is much
+                       # quicker, and means we can easily exclude files on copy
+                       # Not needed for PYTHON_MODULE or WEB_PLUGIN due uses Pyhon framework
+                       # use a hash of the .zip path to handle switching between different
+                       # lib directories without needing a clean build
+                       string(SHA1 PYTHON_ZIP_HASH ${LIBDIR}/release/${PYTHON_ZIP})
+                       set(PYTHON_EXTRACT_DIR ${CMAKE_CURRENT_BINARY_DIR}/${PYTHON_ZIP_HASH}/python)
+
+                       add_custom_target(
+                               extractpyzip
+                               DEPENDS ${PYTHON_EXTRACT_DIR})
+
+                       set(PYTHON_ZIP "python_${CMAKE_OSX_ARCHITECTURES}.zip")
+
+                       add_custom_command(
+                               OUTPUT ${PYTHON_EXTRACT_DIR}
+                               COMMAND ${CMAKE_COMMAND} -E remove_directory "${PYTHON_EXTRACT_DIR}/"
+                               COMMAND ${CMAKE_COMMAND} -E make_directory "${PYTHON_EXTRACT_DIR}/"
+                               COMMAND ${CMAKE_COMMAND} -E chdir "${PYTHON_EXTRACT_DIR}/"
+                                               ${CMAKE_COMMAND} -E tar xzfv "${LIBDIR}/release/${PYTHON_ZIP}"
+                               DEPENDS ${LIBDIR}/release/${PYTHON_ZIP})
+
+                       add_dependencies(blender extractpyzip)
+
+                       # copy extracted python files
+                       install_dir(
+                               ${PYTHON_EXTRACT_DIR}
+                               \${TARGETDIR_VER}
+                       )
+                       # copy site-packages files
+                       install_dir(
+                               ${LIBDIR}/release/site-packages
+                               \${TARGETDIR_VER}/python/lib/python${PYTHON_VERSION}
+                       )
+               endif()
 
                install(DIRECTORY ${LIBDIR}/python/bin
                        DESTINATION ${TARGETDIR_VER}/python
@@ -1003,19 +1018,27 @@ elseif(APPLE)
 
                # python
                if(WITH_PYTHON AND NOT WITH_PYTHON_FRAMEWORK)
-                       add_custom_command(
-                               OUTPUT ${PYTHON_EXTRACT_DIR}
-                               COMMAND ${CMAKE_COMMAND} -E remove_directory "${PYTHON_EXTRACT_DIR}/"
-                               COMMAND ${CMAKE_COMMAND} -E make_directory "${PYTHON_EXTRACT_DIR}/"
-                               COMMAND ${CMAKE_COMMAND} -E chdir "${PYTHON_EXTRACT_DIR}/"
-                                       ${CMAKE_COMMAND} -E tar xzfv "${LIBDIR}/release/${PYTHON_ZIP}"
-                               DEPENDS ${LIBDIR}/release/${PYTHON_ZIP})
-
-                       # copy extracted python files
-                       install_dir(
-                               ${PYTHON_EXTRACT_DIR}
-                               \${PLAYER_TARGETDIR_VER}
-                       )
+                       if(WITH_CXX11)
+                               # Copy the python libs into the install directory
+                               install_dir(
+                                       ${PYTHON_LIBPATH}
+                                       ${PLAYER_TARGETDIR_VER}/python/lib
+                               )
+                       else()
+                               add_custom_command(
+                                       OUTPUT ${PYTHON_EXTRACT_DIR}
+                                       COMMAND ${CMAKE_COMMAND} -E remove_directory "${PYTHON_EXTRACT_DIR}/"
+                                       COMMAND ${CMAKE_COMMAND} -E make_directory "${PYTHON_EXTRACT_DIR}/"
+                                       COMMAND ${CMAKE_COMMAND} -E chdir "${PYTHON_EXTRACT_DIR}/"
+                                                       ${CMAKE_COMMAND} -E tar xzfv "${LIBDIR}/release/${PYTHON_ZIP}"
+                                       DEPENDS ${LIBDIR}/release/${PYTHON_ZIP})
+
+                               # copy extracted python files
+                               install_dir(
+                                       ${PYTHON_EXTRACT_DIR}
+                                       \${PLAYER_TARGETDIR_VER}
+                               )
+                       endif()
                endif()
 
        endif()