embree-usr-symlink-v2.17.x.diff

diff --git a/common/cmake/embree-config.cmake b/common/cmake/embree-config.cmake
index 255354fb2..fe5c2cb4f 100644
--- a/common/cmake/embree-config.cmake
+++ b/common/cmake/embree-config.cmake
@@ -14,8 +14,22 @@
 ## limitations under the License.                                           ##
 ## ======================================================================== ##
 
-SET(EMBREE_ROOT_DIR ${CMAKE_CURRENT_LIST_DIR}/@EMBREE_RELATIV_ROOT_DIR@)
-GET_FILENAME_COMPONENT(EMBREE_ROOT_DIR "${EMBREE_ROOT_DIR}" ABSOLUTE)
+# Compute the installation prefix from this embree-config.cmake file location.
+SET(_embree_installed_prefix "/usr/@CMAKE_INSTALL_LIBDIR@/cmake/embree-@EMBREE_VERSION@")
+SET(_embree_requested_prefix "${CMAKE_CURRENT_LIST_DIR}")
+GET_FILENAME_COMPONENT(_embree_installed_prefix_full "${_embree_installed_prefix}" REALPATH)
+GET_FILENAME_COMPONENT(_embree_requested_prefix_full "${_embree_requested_prefix}" REALPATH)
+IF(_embree_installed_prefix_full STREQUAL _embree_requested_prefix_full)
+  SET(EMBREE_ROOT_DIR "/usr")
+ELSE()
+  SET(EMBREE_ROOT_DIR "${CMAKE_CURRENT_LIST_DIR}")
+  GET_FILENAME_COMPONENT(EMBREE_ROOT_DIR "${EMBREE_ROOT_DIR}" PATH)
+  GET_FILENAME_COMPONENT(EMBREE_ROOT_DIR "${EMBREE_ROOT_DIR}" PATH)
+  GET_FILENAME_COMPONENT(EMBREE_ROOT_DIR "${EMBREE_ROOT_DIR}" PATH)
+  IF(CMAKE_LIBRARY_ARCHITECTURE)
+    GET_FILENAME_COMPONENT(EMBREE_ROOT_DIR "${EMBREE_ROOT_DIR}" PATH)
+  ENDIF()
+ENDIF()
 
 SET(EMBREE_INCLUDE_DIRS ${EMBREE_ROOT_DIR}/@CMAKE_INSTALL_INCLUDEDIR@)
 SET(EMBREE_LIBRARY ${EMBREE_ROOT_DIR}/@CMAKE_INSTALL_LIBDIR@/@EMBREE_LIBRARY_NAME@)