Embree updated

Author: boberfly

CMakeLists.txt

@@ -72,10 +72,7 @@ list(APPEND CMAKE_MODULE_PATH
     "${PROJECT_SOURCE_DIR}/cycles/src/cmake/Modules"
     "${PROJECT_SOURCE_DIR}/cmake/Modules"
 )
-list(APPEND CMAKE_PREFIX_PATH
-    "${CMAKE_INSTALL_PREFIX}/lib/cmake/embree-3.5.0"
-    "${GAFFER_ROOT}/lib/cmake/embree-3.5.0"
-)
+
 find_package(Cortex REQUIRED)
 find_package(OpenEXR REQUIRED Imath)
 find_package(OpenShadingLanguage REQUIRED)
@@ -119,7 +116,7 @@ if( WITH_CYCLES_OPENSUBDIV )
 endif()
 
 if( WITH_CYCLES_EMBREE )
-    find_package(Embree "3.5.0" REQUIRED)
+    find_package(Embree REQUIRED)
     add_definitions( -DWITH_EMBREE=1 )
 endif()
 

build.py

@@ -334,7 +334,6 @@ def releaseId() :
 	"include/*",
 	"lib/*.cubin",
 	"lib/*.ptx",
-	"lib/libembree3*",
 	"lib/libosdCPU*",
 	"lib/libGafferCycles*",
 	"license/*",

dependencies/Embree/config.py

@@ -2,7 +2,7 @@
 
 	"downloads" : [
 
-		"https://github.com/embree/embree/archive/v3.5.0.tar.gz"
+		"https://github.com/embree/embree/archive/v3.7.0.tar.gz"
 
 	],
 
@@ -19,12 +19,12 @@
 			" -D CMAKE_PREFIX_PATH={gafferRoot}"
 			" -D CMAKE_BUILD_TYPE={cmakeBuildType}"
 			" -D {libLinkType}"
-			" -DEMBREE_ISPC_SUPPORT=OFF"
-			" -DEMBREE_TUTORIALS=OFF"
-			" -DEMBREE_RAY_MASK=ON"
-			" -DEMBREE_FILTER_FUNCTION=ON"
-			" -DEMBREE_BACKFACE_CULLING=OFF"
-			" -DEMBREE_TASKING_SYSTEM=INTERNAL"
+			" -D EMBREE_ISPC_SUPPORT=OFF"
+			" -D EMBREE_TUTORIALS=OFF"
+			" -D EMBREE_RAY_MASK=ON"
+			" -D EMBREE_FILTER_FUNCTION=ON"
+			" -D EMBREE_BACKFACE_CULLING=OFF"
+			" -D EMBREE_TASKING_SYSTEM=INTERNAL"
 			" ..",
 		"cd gafferBuild && cmake --build . --config {cmakeBuildType} --target install -- -j {jobs}",
 
@@ -34,7 +34,7 @@
 
 		"static" : "EMBREE_STATIC_LIB=ON",
 		"shared" : "EMBREE_STATIC_LIB=OFF",
-		"default" : "EMBREE_STATIC_LIB=OFF",
+		"default" : "EMBREE_STATIC_LIB=ON",
 
 	},