[Bf-blender-cvs] [f93f4169cbf] blender2.8: Merge branch 'master' into blender2.8

[Bastien Montagne]

Commit: f93f4169cbfb2e3d5583d1bca5aa8466f37393dc
Author: Bastien Montagne
Date:   Sun Apr 23 10:49:39 2017 +0200
Branches: blender2.8
https://developer.blender.org/rBf93f4169cbfb2e3d5583d1bca5aa8466f37393dc

Merge branch 'master' into blender2.8

Conflicts:
	build_files/cmake/platform/platform_apple.cmake

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



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

diff --cc build_files/cmake/platform/platform_apple.cmake
index f2a6aee7a59,6105f2e04de..5336024b75c
--- a/build_files/cmake/platform/platform_apple.cmake
+++ b/build_files/cmake/platform/platform_apple.cmake
@@@ -23,8 -23,10 +23,12 @@@
  
  # Libraries configuration for Apple.
  
 +set(MACOSX_DEPLOYMENT_TARGET "10.9")
 +
+ macro(find_package_wrapper)
+ # do nothing, just satisfy the macro
+ endmacro()
+ 
  if(NOT DEFINED LIBDIR)
  	if(WITH_CXX11)
  		set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/darwin)