Move to embree4

Author: howetuft

build-system/build-settings.json

@@ -7,7 +7,7 @@
   },
   "Dependencies": {
     "user": "LuxCoreRender",
-    "release": "1.1.0-dev1"
+    "release": "1.1.0-dev2"
   },
   "Build": {
     "gcc": "14",

src/luxcore/CMakeLists.txt

@@ -87,7 +87,7 @@ target_link_libraries(luxcore PRIVATE
     boost::boost
     spdlog::spdlog_header_only
     openimageio::openimageio
-    embree
+    embree::embree
     luxparser
 )
 target_link_libraries(luxcore_static PRIVATE
@@ -100,7 +100,7 @@ target_link_libraries(luxcore_static PRIVATE
     boost::boost
     spdlog::spdlog_header_only
     openimageio::openimageio
-    embree
+    embree::embree
     luxparser
 )
 

src/luxcore/luxparser/CMakeLists.txt

@@ -43,7 +43,7 @@ add_library(luxparser STATIC ${BISON_luxbison_OUTPUTS} ${FLEX_luxflex_OUTPUTS})
 target_link_libraries(luxparser PRIVATE
   robin_hood::robin_hood
   boost::boost
-  embree
+  embree::embree
   Imath::Imath
   OpenColorIO::OpenColorIO
 )

src/luxrays/CMakeLists.txt

@@ -238,7 +238,7 @@ set(LUXRAYS_LIB_SRCS
 add_library(luxrays STATIC ${LUXRAYS_LIB_SRCS})
 add_definitions(-DCPP_API_EXPORTS ${VISIBILITY_FLAGS}) # for controlling visibility
 target_link_libraries(luxrays PRIVATE
-  embree
+  embree::embree
   openimageio::openimageio
   boost::boost
   OpenMP::OpenMP_CXX

src/pyluxcore/CMakeLists.txt

@@ -40,7 +40,7 @@ target_link_libraries(pyluxcore PRIVATE
     blender-types
     robin_hood::robin_hood
     openimageio::openimageio
-    embree
+    embree::embree
 )
 target_link_libraries(pyluxcore PRIVATE OpenMP::OpenMP_CXX)
 

src/slg/CMakeLists.txt

@@ -497,7 +497,7 @@ target_link_libraries(slg-core PRIVATE
   openexr::openexr
   opensubdiv::opensubdiv
   Imath::Imath
-  embree
+  embree::embree
   openimageio::openimageio
   nlohmann_json::nlohmann_json
   robin_hood::robin_hood
@@ -716,7 +716,7 @@ add_library(slg-film STATIC ${SLG_FILM_SRCS})
 target_link_libraries(slg-film PRIVATE
     boost::boost
     OpenColorIO::OpenColorIO
-    embree
+    embree::embree
     oidn::oidn
     openimageio::openimageio
     OpenMP::OpenMP_CXX