forked from blender/blender
Cleanup: Reduce use and scope of templates in vertex paint #2
@ -517,6 +517,7 @@ mark_as_advanced(WITH_CYCLES_LOGGING)
|
|||||||
mark_as_advanced(WITH_CYCLES_DEBUG_NAN)
|
mark_as_advanced(WITH_CYCLES_DEBUG_NAN)
|
||||||
mark_as_advanced(WITH_CYCLES_NATIVE_ONLY)
|
mark_as_advanced(WITH_CYCLES_NATIVE_ONLY)
|
||||||
mark_as_advanced(WITH_CYCLES_PRECOMPUTE)
|
mark_as_advanced(WITH_CYCLES_PRECOMPUTE)
|
||||||
|
mark_as_advanced(CYCLES_TEST_DEVICES)
|
||||||
|
|
||||||
# NVIDIA CUDA & OptiX
|
# NVIDIA CUDA & OptiX
|
||||||
if(NOT APPLE)
|
if(NOT APPLE)
|
||||||
@ -1292,6 +1293,9 @@ if(WITH_OPENMP)
|
|||||||
add_definitions("${OpenMP_C_FLAGS}")
|
add_definitions("${OpenMP_C_FLAGS}")
|
||||||
|
|
||||||
find_library_static(OpenMP_LIBRARIES gomp ${CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES})
|
find_library_static(OpenMP_LIBRARIES gomp ${CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES})
|
||||||
|
mark_as_advanced(
|
||||||
|
OpenMP_LIBRARIES
|
||||||
|
)
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
@ -119,5 +119,7 @@ ELSE()
|
|||||||
ENDIF()
|
ENDIF()
|
||||||
|
|
||||||
MARK_AS_ADVANCED(
|
MARK_AS_ADVANCED(
|
||||||
_SYCL_INCLUDE_PARENT_DIR
|
SYCL_COMPILER
|
||||||
|
SYCL_INCLUDE_DIR
|
||||||
|
SYCL_LIBRARY
|
||||||
)
|
)
|
||||||
|
@ -444,10 +444,15 @@ endif()
|
|||||||
if(WITH_COMPILER_CCACHE)
|
if(WITH_COMPILER_CCACHE)
|
||||||
if(NOT CMAKE_GENERATOR STREQUAL "Xcode")
|
if(NOT CMAKE_GENERATOR STREQUAL "Xcode")
|
||||||
find_program(CCACHE_PROGRAM ccache)
|
find_program(CCACHE_PROGRAM ccache)
|
||||||
|
mark_as_advanced(CCACHE_PROGRAM)
|
||||||
if(CCACHE_PROGRAM)
|
if(CCACHE_PROGRAM)
|
||||||
# Makefiles and ninja
|
# Makefiles and ninja
|
||||||
set(CMAKE_C_COMPILER_LAUNCHER "${CCACHE_PROGRAM}" CACHE STRING "" FORCE)
|
set(CMAKE_C_COMPILER_LAUNCHER "${CCACHE_PROGRAM}" CACHE STRING "" FORCE)
|
||||||
set(CMAKE_CXX_COMPILER_LAUNCHER "${CCACHE_PROGRAM}" CACHE STRING "" FORCE)
|
set(CMAKE_CXX_COMPILER_LAUNCHER "${CCACHE_PROGRAM}" CACHE STRING "" FORCE)
|
||||||
|
mark_as_advanced(
|
||||||
|
CMAKE_C_COMPILER_LAUNCHER
|
||||||
|
CMAKE_CXX_COMPILER_LAUNCHER
|
||||||
|
)
|
||||||
else()
|
else()
|
||||||
message(WARNING "Ccache NOT found, disabling WITH_COMPILER_CCACHE")
|
message(WARNING "Ccache NOT found, disabling WITH_COMPILER_CCACHE")
|
||||||
set(WITH_COMPILER_CCACHE OFF)
|
set(WITH_COMPILER_CCACHE OFF)
|
||||||
|
@ -172,6 +172,7 @@ endif()
|
|||||||
if(WITH_COMPILER_CCACHE)
|
if(WITH_COMPILER_CCACHE)
|
||||||
if(CMAKE_GENERATOR STREQUAL "Xcode")
|
if(CMAKE_GENERATOR STREQUAL "Xcode")
|
||||||
find_program(CCACHE_PROGRAM ccache)
|
find_program(CCACHE_PROGRAM ccache)
|
||||||
|
mark_as_advanced(CCACHE_PROGRAM)
|
||||||
if(CCACHE_PROGRAM)
|
if(CCACHE_PROGRAM)
|
||||||
get_filename_component(ccompiler "${CMAKE_C_COMPILER}" NAME)
|
get_filename_component(ccompiler "${CMAKE_C_COMPILER}" NAME)
|
||||||
get_filename_component(cxxcompiler "${CMAKE_CXX_COMPILER}" NAME)
|
get_filename_component(cxxcompiler "${CMAKE_CXX_COMPILER}" NAME)
|
||||||
|
@ -321,11 +321,13 @@ endif()
|
|||||||
|
|
||||||
if(WITH_CYCLES AND WITH_CYCLES_DEVICE_ONEAPI)
|
if(WITH_CYCLES AND WITH_CYCLES_DEVICE_ONEAPI)
|
||||||
set(CYCLES_LEVEL_ZERO ${LIBDIR}/level-zero CACHE PATH "Path to Level Zero installation")
|
set(CYCLES_LEVEL_ZERO ${LIBDIR}/level-zero CACHE PATH "Path to Level Zero installation")
|
||||||
|
mark_as_advanced(CYCLES_LEVEL_ZERO)
|
||||||
if(EXISTS ${CYCLES_LEVEL_ZERO} AND NOT LEVEL_ZERO_ROOT_DIR)
|
if(EXISTS ${CYCLES_LEVEL_ZERO} AND NOT LEVEL_ZERO_ROOT_DIR)
|
||||||
set(LEVEL_ZERO_ROOT_DIR ${CYCLES_LEVEL_ZERO})
|
set(LEVEL_ZERO_ROOT_DIR ${CYCLES_LEVEL_ZERO})
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
set(CYCLES_SYCL ${LIBDIR}/dpcpp CACHE PATH "Path to oneAPI DPC++ compiler")
|
set(CYCLES_SYCL ${LIBDIR}/dpcpp CACHE PATH "Path to oneAPI DPC++ compiler")
|
||||||
|
mark_as_advanced(CYCLES_SYCL)
|
||||||
if(EXISTS ${CYCLES_SYCL} AND NOT SYCL_ROOT_DIR)
|
if(EXISTS ${CYCLES_SYCL} AND NOT SYCL_ROOT_DIR)
|
||||||
set(SYCL_ROOT_DIR ${CYCLES_SYCL})
|
set(SYCL_ROOT_DIR ${CYCLES_SYCL})
|
||||||
endif()
|
endif()
|
||||||
@ -990,10 +992,15 @@ endif()
|
|||||||
|
|
||||||
if(WITH_COMPILER_CCACHE)
|
if(WITH_COMPILER_CCACHE)
|
||||||
find_program(CCACHE_PROGRAM ccache)
|
find_program(CCACHE_PROGRAM ccache)
|
||||||
|
mark_as_advanced(CCACHE_PROGRAM)
|
||||||
if(CCACHE_PROGRAM)
|
if(CCACHE_PROGRAM)
|
||||||
# Makefiles and ninja
|
# Makefiles and ninja
|
||||||
set(CMAKE_C_COMPILER_LAUNCHER "${CCACHE_PROGRAM}" CACHE STRING "" FORCE)
|
set(CMAKE_C_COMPILER_LAUNCHER "${CCACHE_PROGRAM}" CACHE STRING "" FORCE)
|
||||||
set(CMAKE_CXX_COMPILER_LAUNCHER "${CCACHE_PROGRAM}" CACHE STRING "" FORCE)
|
set(CMAKE_CXX_COMPILER_LAUNCHER "${CCACHE_PROGRAM}" CACHE STRING "" FORCE)
|
||||||
|
mark_as_advanced(
|
||||||
|
CMAKE_C_COMPILER_LAUNCHER
|
||||||
|
CMAKE_CXX_COMPILER_LAUNCHER
|
||||||
|
)
|
||||||
else()
|
else()
|
||||||
message(WARNING "Ccache NOT found, disabling WITH_COMPILER_CCACHE")
|
message(WARNING "Ccache NOT found, disabling WITH_COMPILER_CCACHE")
|
||||||
set(WITH_COMPILER_CCACHE OFF)
|
set(WITH_COMPILER_CCACHE OFF)
|
||||||
|
@ -1103,6 +1103,7 @@ set(ZSTD_LIBRARIES ${LIBDIR}/zstd/lib/zstd_static.lib)
|
|||||||
if(WITH_CYCLES AND (WITH_CYCLES_DEVICE_ONEAPI OR (WITH_CYCLES_EMBREE AND EMBREE_SYCL_SUPPORT)))
|
if(WITH_CYCLES AND (WITH_CYCLES_DEVICE_ONEAPI OR (WITH_CYCLES_EMBREE AND EMBREE_SYCL_SUPPORT)))
|
||||||
set(LEVEL_ZERO_ROOT_DIR ${LIBDIR}/level_zero)
|
set(LEVEL_ZERO_ROOT_DIR ${LIBDIR}/level_zero)
|
||||||
set(CYCLES_SYCL ${LIBDIR}/dpcpp CACHE PATH "Path to oneAPI DPC++ compiler")
|
set(CYCLES_SYCL ${LIBDIR}/dpcpp CACHE PATH "Path to oneAPI DPC++ compiler")
|
||||||
|
mark_as_advanced(CYCLES_SYCL)
|
||||||
if(EXISTS ${CYCLES_SYCL} AND NOT SYCL_ROOT_DIR)
|
if(EXISTS ${CYCLES_SYCL} AND NOT SYCL_ROOT_DIR)
|
||||||
set(SYCL_ROOT_DIR ${CYCLES_SYCL})
|
set(SYCL_ROOT_DIR ${CYCLES_SYCL})
|
||||||
endif()
|
endif()
|
||||||
|
@ -832,6 +832,8 @@ if(WITH_CYCLES_DEVICE_ONEAPI)
|
|||||||
)
|
)
|
||||||
|
|
||||||
set(SYCL_OFFLINE_COMPILER_PARALLEL_JOBS 1 CACHE STRING "Number of parallel compiler instances to use for device binaries compilation (expect ~8GB peak memory usage per instance).")
|
set(SYCL_OFFLINE_COMPILER_PARALLEL_JOBS 1 CACHE STRING "Number of parallel compiler instances to use for device binaries compilation (expect ~8GB peak memory usage per instance).")
|
||||||
|
mark_as_advanced(SYCL_OFFLINE_COMPILER_PARALLEL_JOBS)
|
||||||
|
|
||||||
if(WITH_CYCLES_ONEAPI_BINARIES)
|
if(WITH_CYCLES_ONEAPI_BINARIES)
|
||||||
message(STATUS "${SYCL_OFFLINE_COMPILER_PARALLEL_JOBS} instance(s) of oneAPI offline compiler will be used.")
|
message(STATUS "${SYCL_OFFLINE_COMPILER_PARALLEL_JOBS} instance(s) of oneAPI offline compiler will be used.")
|
||||||
endif()
|
endif()
|
||||||
@ -865,6 +867,7 @@ if(WITH_CYCLES_DEVICE_ONEAPI)
|
|||||||
endif()
|
endif()
|
||||||
if(NOT DEFINED CYCLES_ONEAPI_SYCL_OPTIONS_spir64_gen)
|
if(NOT DEFINED CYCLES_ONEAPI_SYCL_OPTIONS_spir64_gen)
|
||||||
set(CYCLES_ONEAPI_SYCL_OPTIONS_spir64_gen "${CYCLES_ONEAPI_SYCL_OPTIONS_spir64}" CACHE STRING "Extra build options for spir64_gen target")
|
set(CYCLES_ONEAPI_SYCL_OPTIONS_spir64_gen "${CYCLES_ONEAPI_SYCL_OPTIONS_spir64}" CACHE STRING "Extra build options for spir64_gen target")
|
||||||
|
mark_as_advanced(CYCLES_ONEAPI_SYCL_OPTIONS_spir64_gen)
|
||||||
endif()
|
endif()
|
||||||
# Enable zebin, a graphics binary format with improved compatibility.
|
# Enable zebin, a graphics binary format with improved compatibility.
|
||||||
string(PREPEND CYCLES_ONEAPI_SYCL_OPTIONS_spir64_gen "--format zebin ")
|
string(PREPEND CYCLES_ONEAPI_SYCL_OPTIONS_spir64_gen "--format zebin ")
|
||||||
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user