From c10ac1bb5c9d0e3bffa97cb5499680c6f1b682b7 Mon Sep 17 00:00:00 2001
From: Brecht Van Lommel <brechtvanlommel@gmail.com>
Date: Thu, 28 Sep 2017 20:52:22 +0200
Subject: macOS: officially upgrade to 10.9 libraries from lib/darwin.

This removes a bunch of code that is no longer needed, and running
"make update" will now automatically download the new libraries.

Differential Revision: https://developer.blender.org/D2861
---
 source/creator/CMakeLists.txt | 74 ++++++-------------------------------------
 1 file changed, 10 insertions(+), 64 deletions(-)

(limited to 'source/creator/CMakeLists.txt')

diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 469ec2dd104..54a212f805b 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -915,49 +915,11 @@ elseif(APPLE)
 
 	# python
 	if(WITH_PYTHON AND NOT WITH_PYTHON_MODULE AND NOT WITH_PYTHON_FRAMEWORK)
-		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()
+		# Copy the python libs into the install directory
+		install_dir(
+			${PYTHON_LIBPATH}
+			${TARGETDIR_VER}/python/lib
+		)
 
 		install(DIRECTORY ${LIBDIR}/python/bin
 			DESTINATION ${TARGETDIR_VER}/python
@@ -1012,27 +974,11 @@ elseif(APPLE)
 
 		# python
 		if(WITH_PYTHON AND NOT WITH_PYTHON_FRAMEWORK)
-			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()
+			# Copy the python libs into the install directory
+			install_dir(
+				${PYTHON_LIBPATH}
+				${PLAYER_TARGETDIR_VER}/python/lib
+			)
 		endif()
 
 	endif()
-- 
cgit v1.2.3