From a060de65a4d34cd1abae17a87f4426cded5b9705 Mon Sep 17 00:00:00 2001
From: Brecht Van Lommel <brecht@blender.org>
Date: Wed, 26 Jun 2024 19:57:10 +0200
Subject: [PATCH] Cycles: Sync minor build related changes with standalone repo

---
 intern/cycles/CMakeLists.txt     |  8 ++++++--
 intern/cycles/app/CMakeLists.txt | 32 ++++++++++++++++++++------------
 intern/cycles/cmake/macros.cmake |  6 ++++++
 intern/cycles/util/version.h     |  8 ++------
 4 files changed, 34 insertions(+), 20 deletions(-)

diff --git a/intern/cycles/CMakeLists.txt b/intern/cycles/CMakeLists.txt
index 19a23b3d077..afeddff83ac 100644
--- a/intern/cycles/CMakeLists.txt
+++ b/intern/cycles/CMakeLists.txt
@@ -395,7 +395,7 @@ if(WITH_CYCLES_DEBUG_NAN)
   add_definitions(-DWITH_CYCLES_DEBUG_NAN)
 endif()
 
-if(NOT OPENIMAGEIO_PUGIXML_FOUND)
+if((NOT OPENIMAGEIO_PUGIXML_FOUND) OR WIN32)
   add_definitions(-DWITH_SYSTEM_PUGIXML)
 endif()
 
@@ -473,5 +473,9 @@ if(WITH_CYCLES_HYDRA_RENDER_DELEGATE OR (WITH_CYCLES_STANDALONE AND WITH_USD))
 endif()
 
 if(NOT WITH_BLENDER)
-  delayed_do_install(${CMAKE_BINARY_DIR}/bin)
+  if(CYCLES_STANDALONE_REPOSITORY)
+    delayed_do_install()
+  else()
+    delayed_do_install(${CMAKE_BINARY_DIR}/bin)
+  endif()
 endif()
diff --git a/intern/cycles/app/CMakeLists.txt b/intern/cycles/app/CMakeLists.txt
index 5892564f50b..4c693deec4d 100644
--- a/intern/cycles/app/CMakeLists.txt
+++ b/intern/cycles/app/CMakeLists.txt
@@ -108,17 +108,29 @@ if(WITH_CYCLES_STANDALONE)
     endif()
   endif()
 
-  if(UNIX AND NOT APPLE)
-    set_target_properties(cycles PROPERTIES INSTALL_RPATH $ORIGIN/lib)
-  endif()
-
   if(CYCLES_STANDALONE_REPOSITORY)
     cycles_install_libraries(cycles)
+
+    if(WITH_USD AND USD_LIBRARY_DIR)
+      install(DIRECTORY
+        ${USD_LIBRARY_DIR}/usd
+        DESTINATION ${CMAKE_INSTALL_PREFIX}
+      )
+
+      install(DIRECTORY
+        ${USD_LIBRARY_DIR}/../plugin/usd
+        DESTINATION ${CMAKE_INSTALL_PREFIX}
+      )
+    endif()
   endif()
 
-  install(PROGRAMS
-    $<TARGET_FILE:cycles>
+  install(
+    TARGETS cycles
     DESTINATION ${CMAKE_INSTALL_PREFIX})
+
+  add_test(
+    NAME cycles_version
+    COMMAND ${CMAKE_INSTALL_PREFIX}/$<TARGET_FILE_NAME:cycles> --version)
 endif()
 
 if(WITH_CYCLES_PRECOMPUTE)
@@ -131,11 +143,7 @@ if(WITH_CYCLES_PRECOMPUTE)
 
   target_link_libraries(cycles_precompute PRIVATE ${LIB})
 
-  if(UNIX AND NOT APPLE)
-    set_target_properties(cycles_precompute PROPERTIES INSTALL_RPATH $ORIGIN/lib)
-  endif()
-
-  install(PROGRAMS
-    $<TARGET_FILE:cycles_precompute>
+  install(
+    TARGETS cycles_precompute
     DESTINATION ${CMAKE_INSTALL_PREFIX})
 endif()
diff --git a/intern/cycles/cmake/macros.cmake b/intern/cycles/cmake/macros.cmake
index caa10a3a5d5..1bb7283c723 100644
--- a/intern/cycles/cmake/macros.cmake
+++ b/intern/cycles/cmake/macros.cmake
@@ -97,6 +97,9 @@ macro(cycles_external_libraries_append libraries)
   endif()
   if(WITH_CYCLES_EMBREE)
     list(APPEND ${libraries} ${EMBREE_LIBRARIES})
+    if(EMBREE_SYCL_SUPPORT)
+      list(APPEND ${libraries} ${SYCL_LIBRARIES})
+    endif()
   endif()
   if(WITH_OPENSUBDIV)
     list(APPEND ${libraries} ${OPENSUBDIV_LIBRARIES})
@@ -174,6 +177,9 @@ macro(cycles_external_libraries_append libraries)
   if(UNIX AND NOT APPLE)
     if(CYCLES_STANDALONE_REPOSITORY)
       list(APPEND ${libraries} extern_libc_compat)
+      # Hack to solve linking order issue where external libs depend on
+      # on our compatibility lib.
+      list(APPEND ${libraries} $<TARGET_FILE:extern_libc_compat>)
     else()
       list(APPEND ${libraries} bf_intern_libc_compat)
     endif()
diff --git a/intern/cycles/util/version.h b/intern/cycles/util/version.h
index 01174fb704e..da120687a3c 100644
--- a/intern/cycles/util/version.h
+++ b/intern/cycles/util/version.h
@@ -9,8 +9,8 @@
 
 CCL_NAMESPACE_BEGIN
 
-#define CYCLES_VERSION_MAJOR 3
-#define CYCLES_VERSION_MINOR 6
+#define CYCLES_VERSION_MAJOR 4
+#define CYCLES_VERSION_MINOR 2
 #define CYCLES_VERSION_PATCH 0
 
 #define CYCLES_MAKE_VERSION_STRING2(a, b, c) #a "." #b "." #c
@@ -18,10 +18,6 @@ CCL_NAMESPACE_BEGIN
 #define CYCLES_VERSION_STRING \
   CYCLES_MAKE_VERSION_STRING(CYCLES_VERSION_MAJOR, CYCLES_VERSION_MINOR, CYCLES_VERSION_PATCH)
 
-/* Blender libraries version compatible with this version */
-
-#define CYCLES_BLENDER_LIBRARIES_VERSION 3.5
-
 CCL_NAMESPACE_END
 
 #endif /* __UTIL_VERSION_H__ */