[Bf-blender-cvs] [6d529750194] master: Cleanup: remove Cycles standalone repository lib detection
Brecht Van Lommel
noreply at git.blender.org
Mon Nov 28 21:06:57 CET 2022
Commit: 6d529750194171d4ac389337b37ddfb13a0351e3
Author: Brecht Van Lommel
Date: Mon Nov 28 19:36:47 2022 +0100
Branches: master
https://developer.blender.org/rB6d529750194171d4ac389337b37ddfb13a0351e3
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.
===================================================================
M intern/cycles/cmake/external_libs.cmake
===================================================================
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)
-
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list