Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Sun, 23 Apr 2017 08:49:39 +0000 (10:49 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Sun, 23 Apr 2017 08:49:39 +0000 (10:49 +0200)
Conflicts:
build_files/cmake/platform/platform_apple.cmake

1  2 
build_files/cmake/platform/platform_apple.cmake

index f2a6aee7a5960e0266dc17e1004b9bc4eb26a2db,6105f2e04deda296e687ab51ecd8ddf6c9c57245..5336024b75ce31be6cae9811159642682b3abf94
  
  # 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)