0579eaae1f
The idea is to make include statements more explicit and obvious where the file is coming from, additionally reducing chance of wrong header being picked up. For example, it was not obvious whether bvh.h was refferring to builder or traversal, whenter node.h is a generic graph node or a shader node and cases like that. Surely this might look obvious for the active developers, but after some time of not touching the code it becomes less obvious where file is coming from. This was briefly mentioned in T50824 and seems @brecht is fine with such explicitness, but need to agree with all active developers before committing this. Please note that this patch is lacking changes related on GPU/OpenCL support. This will be solved if/when we all agree this is a good idea to move forward. Reviewers: brecht, lukasstockner97, maiself, nirved, dingto, juicyfruit, swerner Reviewed By: lukasstockner97, maiself, nirved, dingto Subscribers: brecht Differential Revision: https://developer.blender.org/D2586
76 lines
1.2 KiB
CMake
76 lines
1.2 KiB
CMake
|
|
set(INC
|
|
..
|
|
../../glew-mx
|
|
)
|
|
|
|
set(INC_SYS
|
|
${GLEW_INCLUDE_DIR}
|
|
../../../extern/clew/include
|
|
)
|
|
|
|
if(WITH_CUDA_DYNLOAD)
|
|
list(APPEND INC
|
|
../../../extern/cuew/include
|
|
)
|
|
add_definitions(-DWITH_CUDA_DYNLOAD)
|
|
else()
|
|
list(APPEND INC_SYS
|
|
${CUDA_TOOLKIT_INCLUDE}
|
|
)
|
|
add_definitions(-DCYCLES_CUDA_NVCC_EXECUTABLE="${CUDA_NVCC_EXECUTABLE}")
|
|
endif()
|
|
|
|
set(SRC
|
|
device.cpp
|
|
device_cpu.cpp
|
|
device_cuda.cpp
|
|
device_multi.cpp
|
|
device_opencl.cpp
|
|
device_split_kernel.cpp
|
|
device_task.cpp
|
|
)
|
|
|
|
set(SRC_OPENCL
|
|
opencl/opencl.h
|
|
|
|
opencl/opencl_base.cpp
|
|
opencl/opencl_mega.cpp
|
|
opencl/opencl_split.cpp
|
|
opencl/opencl_util.cpp
|
|
)
|
|
|
|
if(WITH_CYCLES_NETWORK)
|
|
list(APPEND SRC
|
|
device_network.cpp
|
|
)
|
|
endif()
|
|
|
|
set(SRC_HEADERS
|
|
device.h
|
|
device_memory.h
|
|
device_intern.h
|
|
device_network.h
|
|
device_split_kernel.h
|
|
device_task.h
|
|
)
|
|
|
|
add_definitions(${GL_DEFINITIONS})
|
|
if(WITH_CYCLES_NETWORK)
|
|
add_definitions(-DWITH_NETWORK)
|
|
endif()
|
|
if(WITH_CYCLES_DEVICE_OPENCL)
|
|
add_definitions(-DWITH_OPENCL)
|
|
endif()
|
|
if(WITH_CYCLES_DEVICE_CUDA)
|
|
add_definitions(-DWITH_CUDA)
|
|
endif()
|
|
if(WITH_CYCLES_DEVICE_MULTI)
|
|
add_definitions(-DWITH_MULTI)
|
|
endif()
|
|
|
|
include_directories(${INC})
|
|
include_directories(SYSTEM ${INC_SYS})
|
|
|
|
add_library(cycles_device ${SRC} ${SRC_OPENCL} ${SRC_HEADERS})
|