From 6d529750194171d4ac389337b37ddfb13a0351e3 Mon Sep 17 00:00:00 2001
From: Brecht Van Lommel <brecht@blender.org>
Date: Mon, 28 Nov 2022 19:36:47 +0100
Subject: [PATCH] Cleanup: remove Cycles standalone repository lib detection

This is only needed in the Cycles repo and having it in the Blender repo
is making merging more complicated than it is helping.
---
 intern/cycles/cmake/external_libs.cmake | 580 ------------------------
 1 file changed, 580 deletions(-)

diff --git a/intern/cycles/cmake/external_libs.cmake b/intern/cycles/cmake/external_libs.cmake
index 44542a08156..4b165e1a5be 100644
--- a/intern/cycles/cmake/external_libs.cmake
+++ b/intern/cycles/cmake/external_libs.cmake
@@ -1,584 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 # Copyright 2011-2022 Blender Foundation
 
-###########################################################################
-# Helper macros
-###########################################################################
-
-macro(_set_default variable value)
-  if(NOT ${variable})
-    set(${variable} ${value})
-  endif()
-endmacro()
-
-###########################################################################
-# Precompiled libraries detection
-#
-# Use precompiled libraries from Blender repository
-###########################################################################
-
-if(CYCLES_STANDALONE_REPOSITORY)
-  if(APPLE)
-    if("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "x86_64")
-      set(_cycles_lib_dir "${CMAKE_SOURCE_DIR}/../lib/darwin")
-    else()
-      set(_cycles_lib_dir "${CMAKE_SOURCE_DIR}/../lib/darwin_arm64")
-    endif()
-
-    # Always use system zlib
-    find_package(ZLIB REQUIRED)
-  elseif(WIN32)
-    if(CMAKE_CL_64)
-      set(_cycles_lib_dir "${CMAKE_SOURCE_DIR}/../lib/win64_vc15")
-    else()
-      message(FATAL_ERROR "Unsupported Visual Studio Version")
-    endif()
-  else()
-    # Path to a locally compiled libraries.
-    set(LIBDIR_NAME ${CMAKE_SYSTEM_NAME}_${CMAKE_SYSTEM_PROCESSOR})
-    string(TOLOWER ${LIBDIR_NAME} LIBDIR_NAME)
-    set(LIBDIR_NATIVE_ABI ${CMAKE_SOURCE_DIR}/../lib/${LIBDIR_NAME})
-
-    # Path to precompiled libraries with known CentOS 7 ABI.
-    set(LIBDIR_CENTOS7_ABI ${CMAKE_SOURCE_DIR}/../lib/linux_centos7_x86_64)
-
-    # Choose the best suitable libraries.
-    if(EXISTS ${LIBDIR_NATIVE_ABI})
-      set(_cycles_lib_dir ${LIBDIR_NATIVE_ABI})
-    elseif(EXISTS ${LIBDIR_CENTOS7_ABI})
-      set(_cycles_lib_dir ${LIBDIR_CENTOS7_ABI})
-      set(WITH_CXX11_ABI OFF)
-
-      if(CMAKE_COMPILER_IS_GNUCC AND
-         CMAKE_C_COMPILER_VERSION VERSION_LESS 9.3)
-        message(FATAL_ERROR "GCC version must be at least 9.3 for precompiled libraries, found ${CMAKE_C_COMPILER_VERSION}")
-      endif()
-    endif()
-
-    if(DEFINED _cycles_lib_dir)
-      message(STATUS "Using precompiled libraries at ${_cycles_lib_dir}")
-    endif()
-
-    # Avoid namespace pollustion.
-    unset(LIBDIR_NATIVE_ABI)
-    unset(LIBDIR_CENTOS7_ABI)
-  endif()
-
-  if(EXISTS ${_cycles_lib_dir})
-    _set_default(ALEMBIC_ROOT_DIR "${_cycles_lib_dir}/alembic")
-    _set_default(BOOST_ROOT "${_cycles_lib_dir}/boost")
-    _set_default(BLOSC_ROOT_DIR "${_cycles_lib_dir}/blosc")
-    _set_default(EMBREE_ROOT_DIR "${_cycles_lib_dir}/embree")
-    _set_default(EPOXY_ROOT_DIR "${_cycles_lib_dir}/epoxy")
-    _set_default(IMATH_ROOT_DIR "${_cycles_lib_dir}/imath")
-    _set_default(GLEW_ROOT_DIR "${_cycles_lib_dir}/glew")
-    _set_default(JPEG_ROOT "${_cycles_lib_dir}/jpeg")
-    _set_default(LLVM_ROOT_DIR "${_cycles_lib_dir}/llvm")
-    _set_default(CLANG_ROOT_DIR "${_cycles_lib_dir}/llvm")
-    _set_default(NANOVDB_ROOT_DIR "${_cycles_lib_dir}/openvdb")
-    _set_default(OPENCOLORIO_ROOT_DIR "${_cycles_lib_dir}/opencolorio")
-    _set_default(OPENEXR_ROOT_DIR "${_cycles_lib_dir}/openexr")
-    _set_default(OPENIMAGEDENOISE_ROOT_DIR "${_cycles_lib_dir}/openimagedenoise")
-    _set_default(OPENIMAGEIO_ROOT_DIR "${_cycles_lib_dir}/openimageio")
-    _set_default(OPENJPEG_ROOT_DIR "${_cycles_lib_dir}/openjpeg")
-    _set_default(OPENSUBDIV_ROOT_DIR "${_cycles_lib_dir}/opensubdiv")
-    _set_default(OPENVDB_ROOT_DIR "${_cycles_lib_dir}/openvdb")
-    _set_default(OSL_ROOT_DIR "${_cycles_lib_dir}/osl")
-    _set_default(PNG_ROOT "${_cycles_lib_dir}/png")
-    _set_default(PUGIXML_ROOT_DIR "${_cycles_lib_dir}/pugixml")
-    _set_default(SDL2_ROOT_DIR "${_cycles_lib_dir}/sdl")
-    _set_default(TBB_ROOT_DIR "${_cycles_lib_dir}/tbb")
-    _set_default(TIFF_ROOT "${_cycles_lib_dir}/tiff")
-    _set_default(USD_ROOT_DIR "${_cycles_lib_dir}/usd")
-    _set_default(WEBP_ROOT_DIR "${_cycles_lib_dir}/webp")
-    _set_default(ZLIB_ROOT "${_cycles_lib_dir}/zlib")
-    if(WIN32)
-      set(LEVEL_ZERO_ROOT_DIR ${_cycles_lib_dir}/level_zero)
-    else()
-      set(LEVEL_ZERO_ROOT_DIR ${_cycles_lib_dir}/level-zero)
-    endif()
-    _set_default(SYCL_ROOT_DIR "${_cycles_lib_dir}/dpcpp")
-
-    # Ignore system libraries
-    set(CMAKE_IGNORE_PATH "${CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES};${CMAKE_SYSTEM_INCLUDE_PATH};${CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES};${CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES}")
-  else()
-    unset(_cycles_lib_dir)
-  endif()
-endif()
-
-###########################################################################
-# Zlib
-###########################################################################
-
-if(CYCLES_STANDALONE_REPOSITORY)
-  if(MSVC AND EXISTS ${_cycles_lib_dir})
-    set(ZLIB_INCLUDE_DIRS ${_cycles_lib_dir}/zlib/include)
-    set(ZLIB_LIBRARIES ${_cycles_lib_dir}/zlib/lib/libz_st.lib)
-    set(ZLIB_INCLUDE_DIR ${_cycles_lib_dir}/zlib/include)
-    set(ZLIB_LIBRARY ${_cycles_lib_dir}/zlib/lib/libz_st.lib)
-    set(ZLIB_DIR ${_cycles_lib_dir}/zlib)
-    set(ZLIB_FOUND ON)
-  elseif(NOT APPLE)
-    find_package(ZLIB REQUIRED)
-  endif()
-endif()
-
-###########################################################################
-# PThreads
-###########################################################################
-
-if(CYCLES_STANDALONE_REPOSITORY)
-  if(MSVC AND EXISTS ${_cycles_lib_dir})
-    set(PTHREADS_LIBRARIES "${_cycles_lib_dir}/pthreads/lib/pthreadVC3.lib")
-    include_directories("${_cycles_lib_dir}/pthreads/include")
-  else()
-    set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
-    find_package(Threads REQUIRED)
-    set(PTHREADS_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
-  endif()
-endif()
-
-###########################################################################
-# OpenImageIO and image libraries
-###########################################################################
-
-if(CYCLES_STANDALONE_REPOSITORY)
-  if(MSVC AND EXISTS ${_cycles_lib_dir})
-    add_definitions(
-      # OIIO changed the name of this define in newer versions
-      # we define both, so it would work with both old and new
-      # versions.
-      -DOIIO_STATIC_BUILD
-      -DOIIO_STATIC_DEFINE
-    )
-
-    set(OPENIMAGEIO_INCLUDE_DIR ${OPENIMAGEIO_ROOT_DIR}/include)
-    set(OPENIMAGEIO_INCLUDE_DIRS ${OPENIMAGEIO_INCLUDE_DIR} ${OPENIMAGEIO_INCLUDE_DIR}/OpenImageIO)
-    # Special exceptions for libraries which needs explicit debug version
-    set(OPENIMAGEIO_LIBRARIES
-      optimized ${OPENIMAGEIO_ROOT_DIR}/lib/OpenImageIO.lib
-      optimized ${OPENIMAGEIO_ROOT_DIR}/lib/OpenImageIO_Util.lib
-      debug ${OPENIMAGEIO_ROOT_DIR}/lib/OpenImageIO_d.lib
-      debug ${OPENIMAGEIO_ROOT_DIR}/lib/OpenImageIO_Util_d.lib
-    )
-
-    set(PUGIXML_INCLUDE_DIR ${PUGIXML_ROOT_DIR}/include)
-    set(PUGIXML_LIBRARIES
-      optimized ${PUGIXML_ROOT_DIR}/lib/pugixml.lib
-      debug ${PUGIXML_ROOT_DIR}/lib/pugixml_d.lib
-    )
-  else()
-    find_package(OpenImageIO REQUIRED)
-    if(OPENIMAGEIO_PUGIXML_FOUND)
-      set(PUGIXML_INCLUDE_DIR "${OPENIMAGEIO_INCLUDE_DIR}/OpenImageIO")
-      set(PUGIXML_LIBRARIES "")
-    else()
-      find_package(PugiXML REQUIRED)
-    endif()
-  endif()
-
-  # Dependencies
-  if(MSVC AND EXISTS ${_cycles_lib_dir})
-    set(OPENJPEG_INCLUDE_DIR ${OPENJPEG}/include/openjpeg-2.3)
-    set(OPENJPEG_LIBRARIES ${_cycles_lib_dir}/openjpeg/lib/openjp2${CMAKE_STATIC_LIBRARY_SUFFIX})
-  else()
-    find_package(OpenJPEG REQUIRED)
-  endif()
-
-  find_package(JPEG REQUIRED)
-  find_package(TIFF REQUIRED)
-  find_package(WebP)
-
-  if(EXISTS ${_cycles_lib_dir})
-    set(PNG_NAMES png16 libpng16 png libpng)
-  endif()
-  find_package(PNG REQUIRED)
-endif()
-
-###########################################################################
-# OpenEXR
-###########################################################################
-
-if(CYCLES_STANDALONE_REPOSITORY)
-  if(MSVC AND EXISTS ${_cycles_lib_dir})
-    set(OPENEXR_INCLUDE_DIR ${OPENEXR_ROOT_DIR}/include)
-    set(OPENEXR_INCLUDE_DIRS ${OPENEXR_INCLUDE_DIR} ${OPENEXR_ROOT_DIR}/include/OpenEXR ${IMATH_ROOT_DIR}/include ${IMATH_ROOT_DIR}/include/Imath)
-    set(OPENEXR_LIBRARIES
-      optimized ${OPENEXR_ROOT_DIR}/lib/OpenEXR_s.lib
-      optimized ${OPENEXR_ROOT_DIR}/lib/OpenEXRCore_s.lib
-      optimized ${OPENEXR_ROOT_DIR}/lib/Iex_s.lib
-      optimized ${IMATH_ROOT_DIR}/lib/Imath_s.lib
-      optimized ${OPENEXR_ROOT_DIR}/lib/IlmThread_s.lib
-      debug ${OPENEXR_ROOT_DIR}/lib/OpenEXR_s_d.lib
-      debug ${OPENEXR_ROOT_DIR}/lib/OpenEXRCore_s_d.lib
-      debug ${OPENEXR_ROOT_DIR}/lib/Iex_s_d.lib
-      debug ${IMATH_ROOT_DIR}/lib/Imath_s_d.lib
-      debug ${OPENEXR_ROOT_DIR}/lib/IlmThread_s_d.lib
-    )
-  else()
-    find_package(OpenEXR REQUIRED)
-  endif()
-endif()
-
-###########################################################################
-# OpenShadingLanguage & LLVM
-###########################################################################
-
-if(CYCLES_STANDALONE_REPOSITORY AND WITH_CYCLES_OSL)
-  if(EXISTS ${_cycles_lib_dir})
-    set(LLVM_STATIC ON)
-  endif()
-
-  if(MSVC AND EXISTS ${_cycles_lib_dir})
-    # TODO(sergey): On Windows llvm-config doesn't give proper results for the
-    # library names, use hardcoded libraries for now.
-    file(GLOB _llvm_libs_release ${LLVM_ROOT_DIR}/lib/*.lib)
-    file(GLOB _llvm_libs_debug ${LLVM_ROOT_DIR}/debug/lib/*.lib)
-    set(_llvm_libs)
-    foreach(_llvm_lib_path ${_llvm_libs_release})
-      get_filename_component(_llvm_lib_name ${_llvm_lib_path} ABSOLUTE)
-      list(APPEND _llvm_libs optimized ${_llvm_lib_name})
-    endforeach()
-    foreach(_llvm_lib_path ${_llvm_libs_debug})
-      get_filename_component(_llvm_lib_name ${_llvm_lib_path} ABSOLUTE)
-      list(APPEND _llvm_libs debug ${_llvm_lib_name})
-    endforeach()
-    set(LLVM_LIBRARY ${_llvm_libs})
-    unset(_llvm_lib_name)
-    unset(_llvm_lib_path)
-    unset(_llvm_libs)
-    unset(_llvm_libs_debug)
-    unset(_llvm_libs_release)
-
-    set(OSL_INCLUDE_DIR ${OSL_ROOT_DIR}/include)
-    set(OSL_LIBRARIES
-      optimized ${OSL_ROOT_DIR}/lib/oslcomp.lib
-      optimized ${OSL_ROOT_DIR}/lib/oslexec.lib
-      optimized ${OSL_ROOT_DIR}/lib/oslquery.lib
-      debug ${OSL_ROOT_DIR}/lib/oslcomp_d.lib
-      debug ${OSL_ROOT_DIR}/lib/oslexec_d.lib
-      debug ${OSL_ROOT_DIR}/lib/oslquery_d.lib
-      ${PUGIXML_LIBRARIES}
-    )
-
-    find_program(OSL_COMPILER NAMES oslc PATHS ${OSL_ROOT_DIR}/bin)
-  else()
-    find_package(OSL REQUIRED)
-    find_package(LLVM REQUIRED)
-    find_package(Clang REQUIRED)
-  endif()
-endif()
-
-###########################################################################
-# OpenPGL
-###########################################################################
-
-if(CYCLES_STANDALONE_REPOSITORY AND WITH_CYCLES_PATH_GUIDING)
-  if(NOT openpgl_DIR AND EXISTS ${_cycles_lib_dir})
-    set(openpgl_DIR ${_cycles_lib_dir}/openpgl/lib/cmake/openpgl)
-  endif()
-
-  find_package(openpgl QUIET)
-  if(openpgl_FOUND)
-    if(WIN32)
-      get_target_property(OPENPGL_LIBRARIES_RELEASE openpgl::openpgl LOCATION_RELEASE)
-      get_target_property(OPENPGL_LIBRARIES_DEBUG openpgl::openpgl LOCATION_DEBUG)
-      set(OPENPGL_LIBRARIES optimized ${OPENPGL_LIBRARIES_RELEASE} debug ${OPENPGL_LIBRARIES_DEBUG})
-    else()
-      get_target_property(OPENPGL_LIBRARIES openpgl::openpgl LOCATION)
-    endif()
-    get_target_property(OPENPGL_INCLUDE_DIR openpgl::openpgl INTERFACE_INCLUDE_DIRECTORIES)
-  else()
-    set_and_warn_library_found("OpenPGL" openpgl_FOUND WITH_CYCLES_PATH_GUIDING)
-  endif()
-endif()
-
-###########################################################################
-# OpenColorIO
-###########################################################################
-
-if(CYCLES_STANDALONE_REPOSITORY AND WITH_CYCLES_OPENCOLORIO)
-  set(WITH_OPENCOLORIO ON)
-
-  if(NOT USD_OVERRIDE_OPENCOLORIO)
-    if(MSVC AND EXISTS ${_cycles_lib_dir})
-      set(OPENCOLORIO_INCLUDE_DIRS ${OPENCOLORIO_ROOT_DIR}/include)
-      set(OPENCOLORIO_LIBRARIES
-        optimized ${OPENCOLORIO_ROOT_DIR}/lib/OpenColorIO.lib
-        optimized ${OPENCOLORIO_ROOT_DIR}/lib/libyaml-cpp.lib
-        optimized ${OPENCOLORIO_ROOT_DIR}/lib/libexpatMD.lib
-        optimized ${OPENCOLORIO_ROOT_DIR}/lib/pystring.lib
-        debug ${OPENCOLORIO_ROOT_DIR}/lib/OpencolorIO_d.lib
-        debug ${OPENCOLORIO_ROOT_DIR}/lib/libyaml-cpp_d.lib
-        debug ${OPENCOLORIO_ROOT_DIR}/lib/libexpatdMD.lib
-        debug ${OPENCOLORIO_ROOT_DIR}/lib/pystring_d.lib
-      )
-    else()
-      find_package(OpenColorIO REQUIRED)
-    endif()
-  endif()
-endif()
-
-###########################################################################
-# Boost
-###########################################################################
-
-if(CYCLES_STANDALONE_REPOSITORY)
-  if(EXISTS ${_cycles_lib_dir})
-    if(MSVC)
-      set(Boost_USE_STATIC_RUNTIME OFF)
-      set(Boost_USE_MULTITHREADED ON)
-      set(Boost_USE_STATIC_LIBS ON)
-    else()
-      set(BOOST_LIBRARYDIR ${_cycles_lib_dir}/boost/lib)
-      set(Boost_NO_BOOST_CMAKE ON)
-      set(Boost_NO_SYSTEM_PATHS ON)
-    endif()
-  endif()
-
-  if(MSVC AND EXISTS ${_cycles_lib_dir})
-    set(BOOST_INCLUDE_DIR ${BOOST_ROOT}/include)
-    set(BOOST_VERSION_HEADER ${BOOST_INCLUDE_DIR}/boost/version.hpp)
-    if(EXISTS ${BOOST_VERSION_HEADER})
-      file(STRINGS "${BOOST_VERSION_HEADER}" BOOST_LIB_VERSION REGEX "#define BOOST_LIB_VERSION ")
-      if(BOOST_LIB_VERSION MATCHES "#define BOOST_LIB_VERSION \"([0-9_]+)\"")
-        set(BOOST_VERSION "${CMAKE_MATCH_1}")
-      endif()
-    endif()
-    if(NOT BOOST_VERSION)
-      message(FATAL_ERROR "Unable to determine Boost version")
-    endif()
-    set(BOOST_POSTFIX "vc142-mt-x64-${BOOST_VERSION}.lib")
-    set(BOOST_DEBUG_POSTFIX "vc142-mt-gd-x64-${BOOST_VERSION}.lib")
-    set(BOOST_LIBRARIES
-      optimized ${BOOST_ROOT}/lib/libboost_date_time-${BOOST_POSTFIX}
-      optimized ${BOOST_ROOT}/lib/libboost_iostreams-${BOOST_POSTFIX}
-      optimized ${BOOST_ROOT}/lib/libboost_filesystem-${BOOST_POSTFIX}
-      optimized ${BOOST_ROOT}/lib/libboost_regex-${BOOST_POSTFIX}
-      optimized ${BOOST_ROOT}/lib/libboost_system-${BOOST_POSTFIX}
-      optimized ${BOOST_ROOT}/lib/libboost_thread-${BOOST_POSTFIX}
-      optimized ${BOOST_ROOT}/lib/libboost_chrono-${BOOST_POSTFIX}
-      debug ${BOOST_ROOT}/lib/libboost_date_time-${BOOST_DEBUG_POSTFIX}
-      debug ${BOOST_ROOT}/lib/libboost_iostreams-${BOOST_DEBUG_POSTFIX}
-      debug ${BOOST_ROOT}/lib/libboost_filesystem-${BOOST_DEBUG_POSTFIX}
-      debug ${BOOST_ROOT}/lib/libboost_regex-${BOOST_DEBUG_POSTFIX}
-      debug ${BOOST_ROOT}/lib/libboost_system-${BOOST_DEBUG_POSTFIX}
-      debug ${BOOST_ROOT}/lib/libboost_thread-${BOOST_DEBUG_POSTFIX}
-      debug ${BOOST_ROOT}/lib/libboost_chrono-${BOOST_DEBUG_POSTFIX}
-    )
-    if(WITH_CYCLES_OSL)
-      set(BOOST_LIBRARIES ${BOOST_LIBRARIES}
-        optimized ${BOOST_ROOT}/lib/libboost_wave-${BOOST_POSTFIX}
-        debug ${BOOST_ROOT}/lib/libboost_wave-${BOOST_DEBUG_POSTFIX})
-    endif()
-  else()
-    set(__boost_packages iostreams filesystem regex system thread date_time)
-    if(WITH_CYCLES_OSL)
-      list(APPEND __boost_packages wave)
-    endif()
-    find_package(Boost 1.48 COMPONENTS ${__boost_packages} REQUIRED)
-    if(NOT Boost_FOUND)
-      # Try to find non-multithreaded if -mt not found, this flag
-      # doesn't matter for us, it has nothing to do with thread
-      # safety, but keep it to not disturb build setups.
-      set(Boost_USE_MULTITHREADED OFF)
-      find_package(Boost 1.48 COMPONENTS ${__boost_packages})
-    endif()
-    unset(__boost_packages)
-
-    set(BOOST_INCLUDE_DIR ${Boost_INCLUDE_DIRS})
-    set(BOOST_LIBRARIES ${Boost_LIBRARIES})
-    set(BOOST_LIBPATH ${Boost_LIBRARY_DIRS})
-  endif()
-
-  set(BOOST_DEFINITIONS "-DBOOST_ALL_NO_LIB ${BOOST_DEFINITIONS}")
-endif()
-
-###########################################################################
-# Embree
-###########################################################################
-
-if(CYCLES_STANDALONE_REPOSITORY AND WITH_CYCLES_EMBREE)
-  if(MSVC AND EXISTS ${_cycles_lib_dir})
-    set(EMBREE_INCLUDE_DIRS ${EMBREE_ROOT_DIR}/include)
-    set(EMBREE_LIBRARIES
-      optimized ${EMBREE_ROOT_DIR}/lib/embree3.lib
-      optimized ${EMBREE_ROOT_DIR}/lib/embree_avx2.lib
-      optimized ${EMBREE_ROOT_DIR}/lib/embree_avx.lib
-      optimized ${EMBREE_ROOT_DIR}/lib/embree_sse42.lib
-      optimized ${EMBREE_ROOT_DIR}/lib/lexers.lib
-      optimized ${EMBREE_ROOT_DIR}/lib/math.lib
-      optimized ${EMBREE_ROOT_DIR}/lib/simd.lib
-      optimized ${EMBREE_ROOT_DIR}/lib/tasking.lib
-      optimized ${EMBREE_ROOT_DIR}/lib/sys.lib
-      debug ${EMBREE_ROOT_DIR}/lib/embree3_d.lib
-      debug ${EMBREE_ROOT_DIR}/lib/embree_avx2_d.lib
-      debug ${EMBREE_ROOT_DIR}/lib/embree_avx_d.lib
-      debug ${EMBREE_ROOT_DIR}/lib/embree_sse42_d.lib
-      debug ${EMBREE_ROOT_DIR}/lib/lexers_d.lib
-      debug ${EMBREE_ROOT_DIR}/lib/math_d.lib
-      debug ${EMBREE_ROOT_DIR}/lib/simd_d.lib
-      debug ${EMBREE_ROOT_DIR}/lib/sys_d.lib
-      debug ${EMBREE_ROOT_DIR}/lib/tasking_d.lib
-    )
-  else()
-    find_package(Embree 3.8.0 REQUIRED)
-  endif()
-endif()
-
-###########################################################################
-# Logging
-###########################################################################
-
-if(CYCLES_STANDALONE_REPOSITORY AND WITH_CYCLES_LOGGING)
-  find_package(Glog REQUIRED)
-  find_package(Gflags REQUIRED)
-endif()
-
-###########################################################################
-# OpenSubdiv
-###########################################################################
-
-if(CYCLES_STANDALONE_REPOSITORY AND WITH_CYCLES_OPENSUBDIV)
-  set(WITH_OPENSUBDIV ON)
-
-  if(NOT USD_OVERRIDE_OPENSUBDIV)
-    if(MSVC AND EXISTS ${_cycles_lib_dir})
-      set(OPENSUBDIV_INCLUDE_DIRS ${OPENSUBDIV_ROOT_DIR}/include)
-      set(OPENSUBDIV_LIBRARIES
-        optimized ${OPENSUBDIV_ROOT_DIR}/lib/osdCPU.lib
-        optimized ${OPENSUBDIV_ROOT_DIR}/lib/osdGPU.lib
-        debug ${OPENSUBDIV_ROOT_DIR}/lib/osdCPU_d.lib
-        debug ${OPENSUBDIV_ROOT_DIR}/lib/osdGPU_d.lib
-      )
-    else()
-      find_package(OpenSubdiv REQUIRED)
-    endif()
-  endif()
-endif()
-
-###########################################################################
-# OpenVDB
-###########################################################################
-
-if(CYCLES_STANDALONE_REPOSITORY AND WITH_CYCLES_OPENVDB)
-  set(WITH_OPENVDB ON)
-  set(OPENVDB_DEFINITIONS -DNOMINMAX -D_USE_MATH_DEFINES)
-
-  if(NOT USD_OVERRIDE_OPENVDB)
-    find_package(OpenVDB REQUIRED)
-
-    if(MSVC AND EXISTS ${_cycles_lib_dir})
-      set(BLOSC_LIBRARY
-        optimized ${BLOSC_ROOT_DIR}/lib/libblosc.lib
-        debug ${BLOSC_ROOT_DIR}/lib/libblosc_d.lib
-      )
-    else()
-      find_package(Blosc REQUIRED)
-    endif()
-  endif()
-endif()
-
-###########################################################################
-# NanoVDB
-###########################################################################
-
-if(CYCLES_STANDALONE_REPOSITORY AND WITH_CYCLES_NANOVDB)
-  set(WITH_NANOVDB ON)
-
-  if(MSVC AND EXISTS ${_cycles_lib_dir})
-    set(NANOVDB_INCLUDE_DIR ${NANOVDB_ROOT_DIR}/include)
-    set(NANOVDB_INCLUDE_DIRS ${NANOVDB_INCLUDE_DIR})
-  else()
-    find_package(NanoVDB REQUIRED)
-  endif()
-endif()
-
-###########################################################################
-# OpenImageDenoise
-###########################################################################
-
-if(CYCLES_STANDALONE_REPOSITORY AND WITH_CYCLES_OPENIMAGEDENOISE)
-  set(WITH_OPENIMAGEDENOISE ON)
-
-  if(MSVC AND EXISTS ${_cycles_lib_dir})
-    set(OPENIMAGEDENOISE_INCLUDE_DIRS ${OPENIMAGEDENOISE_ROOT_DIR}/include)
-    set(OPENIMAGEDENOISE_LIBRARIES
-      optimized ${OPENIMAGEDENOISE_ROOT_DIR}/lib/OpenImageDenoise.lib
-      optimized ${OPENIMAGEDENOISE_ROOT_DIR}/lib/common.lib
-      optimized ${OPENIMAGEDENOISE_ROOT_DIR}/lib/dnnl.lib
-      debug ${OPENIMAGEDENOISE_ROOT_DIR}/lib/OpenImageDenoise_d.lib
-      debug ${OPENIMAGEDENOISE_ROOT_DIR}/lib/common_d.lib
-      debug ${OPENIMAGEDENOISE_ROOT_DIR}/lib/dnnl_d.lib
-    )
-  else()
-    find_package(OpenImageDenoise REQUIRED)
-  endif()
-endif()
-
-###########################################################################
-# TBB
-###########################################################################
-
-if(CYCLES_STANDALONE_REPOSITORY)
-  if(NOT USD_OVERRIDE_TBB)
-    if(MSVC AND EXISTS ${_cycles_lib_dir})
-      set(TBB_INCLUDE_DIRS ${TBB_ROOT_DIR}/include)
-      set(TBB_LIBRARIES
-        optimized ${TBB_ROOT_DIR}/lib/tbb.lib
-        debug ${TBB_ROOT_DIR}/lib/tbb_debug.lib
-      )
-    else()
-      find_package(TBB REQUIRED)
-    endif()
-  endif()
-endif()
-
-###########################################################################
-# Epoxy
-###########################################################################
-
-if(CYCLES_STANDALONE_REPOSITORY)
-  if((WITH_CYCLES_STANDALONE AND WITH_CYCLES_STANDALONE_GUI) OR
-     WITH_CYCLES_HYDRA_RENDER_DELEGATE)
-    if(MSVC AND EXISTS ${_cycles_lib_dir})
-      set(Epoxy_LIBRARIES "${_cycles_lib_dir}/epoxy/lib/epoxy.lib")
-      set(Epoxy_INCLUDE_DIRS "${_cycles_lib_dir}/epoxy/include")
-    else()
-      find_package(Epoxy REQUIRED)
-    endif()
-  endif()
-endif()
-
-###########################################################################
-# Alembic
-###########################################################################
-
-if(WITH_CYCLES_ALEMBIC)
-  if(CYCLES_STANDALONE_REPOSITORY)
-    if(MSVC AND EXISTS ${_cycles_lib_dir})
-      set(ALEMBIC_INCLUDE_DIRS ${_cycles_lib_dir}/alembic/include)
-      set(ALEMBIC_LIBRARIES
-        optimized ${_cycles_lib_dir}/alembic/lib/Alembic.lib
-        debug ${_cycles_lib_dir}/alembic/lib/Alembic_d.lib)
-    else()
-      find_package(Alembic REQUIRED)
-    endif()
-
-    set(WITH_ALEMBIC ON)
-  endif()
-endif()
-
-###########################################################################
-# System Libraries
-###########################################################################
-
-# Detect system libraries again
-if(EXISTS ${_cycles_lib_dir})
-  unset(CMAKE_IGNORE_PATH)
-  unset(_cycles_lib_dir)
-endif()
-
 ###########################################################################
 # SDL
 ###########################################################################
@@ -687,5 +109,3 @@ if(WITH_CYCLES_DEVICE_ONEAPI)
     set(WITH_CYCLES_DEVICE_ONEAPI OFF)
   endif()
 endif()
-
-unset(_cycles_lib_dir)