[Bf-blender-cvs] [c1aea353aec] master: OSX buildbot: disable unsupported calls for now and use quicktime off default

Jens Verwiebe noreply at git.blender.org
Wed Apr 26 14:04:19 CEST 2017


Commit: c1aea353aec5e5070054ace630b1b2e4465238f3
Author: Jens Verwiebe
Date:   Wed Apr 26 14:02:53 2017 +0200
Branches: master
https://developer.blender.org/rBc1aea353aec5e5070054ace630b1b2e4465238f3

OSX buildbot: disable unsupported calls for now and use quicktime off default

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

M	build_files/cmake/config/blender_full.cmake
M	build_files/cmake/config/blender_release.cmake

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

diff --git a/build_files/cmake/config/blender_full.cmake b/build_files/cmake/config/blender_full.cmake
index 87b8ed5f921..1acc48b48ab 100644
--- a/build_files/cmake/config/blender_full.cmake
+++ b/build_files/cmake/config/blender_full.cmake
@@ -75,8 +75,8 @@ elseif(APPLE)
 	set(WITH_JACK                ON  CACHE BOOL "" FORCE)
 	set(WITH_CODEC_QUICKTIME     ON  CACHE BOOL "" FORCE)
 	set(WITH_OPENSUBDIV          OFF CACHE BOOL "" FORCE)
-	set(WITH_CODEC_QUICKTIME     ON  CACHE BOOL "" FORCE)
+#	set(WITH_CODEC_QUICKTIME     ON  CACHE BOOL "" FORCE)
 
-	include("${CMAKE_CURRENT_SOURCE_DIR}/../platform/platform_apple_xcode.cmake")
-	apple_check_quicktime()
+#	include("${CMAKE_CURRENT_SOURCE_DIR}/../platform/platform_apple_xcode.cmake")
+#	apple_check_quicktime()
 endif()
diff --git a/build_files/cmake/config/blender_release.cmake b/build_files/cmake/config/blender_release.cmake
index b60c8c7380c..09e2faea08e 100644
--- a/build_files/cmake/config/blender_release.cmake
+++ b/build_files/cmake/config/blender_release.cmake
@@ -76,8 +76,8 @@ elseif(APPLE)
 	set(WITH_JACK                ON  CACHE BOOL "" FORCE)
 	set(WITH_CODEC_QUICKTIME     ON  CACHE BOOL "" FORCE)
 	set(WITH_OPENSUBDIV          OFF CACHE BOOL "" FORCE)
-	set(WITH_CODEC_QUICKTIME     ON  CACHE BOOL "" FORCE)
+#	set(WITH_CODEC_QUICKTIME     ON  CACHE BOOL "" FORCE)
 
-	include("${CMAKE_CURRENT_SOURCE_DIR}/../platform/platform_apple_xcode.cmake")
-	apple_check_quicktime()
+#	include("${CMAKE_CURRENT_SOURCE_DIR}/../platform/platform_apple_xcode.cmake")
+#	apple_check_quicktime()
 endif()




More information about the Bf-blender-cvs mailing list