diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-04-16 07:11:27 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-04-16 07:15:18 +0300 |
| commit | 813e470eac309a78d1f8cdc4a3abb0314b0ee5f3 (patch) | |
| tree | 65bfb0ea60eb6f595b38fedcf33eb0a59f072cb0 /intern/cycles/kernel | |
| parent | bb6b7dd4adebcdacfeabdaf26daa5e0d49079f67 (diff) | |
CMake: cleanup, arg rename, add definitions last
Diffstat (limited to 'intern/cycles/kernel')
| -rw-r--r-- | intern/cycles/kernel/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | intern/cycles/kernel/osl/CMakeLists.txt | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/intern/cycles/kernel/CMakeLists.txt b/intern/cycles/kernel/CMakeLists.txt index 822ce68bdc8..cbb69962781 100644 --- a/intern/cycles/kernel/CMakeLists.txt +++ b/intern/cycles/kernel/CMakeLists.txt @@ -333,6 +333,10 @@ set(SRC_SPLIT_HEADERS split/kernel_subsurface_scatter.h ) +set(LIB + +) + # CUDA module if(WITH_CYCLES_CUDA_BINARIES) @@ -507,7 +511,7 @@ if(CXX_HAS_AVX2) set_source_files_properties(kernels/cpu/filter_avx2.cpp PROPERTIES COMPILE_FLAGS "${CYCLES_AVX2_KERNEL_FLAGS}") endif() -cycles_add_library(cycles_kernel +cycles_add_library(cycles_kernel "${LIB}" ${SRC_CPU_KERNELS} ${SRC_CUDA_KERNELS} ${SRC_OPENCL_KERNELS} diff --git a/intern/cycles/kernel/osl/CMakeLists.txt b/intern/cycles/kernel/osl/CMakeLists.txt index adca45c5c76..804610bdc10 100644 --- a/intern/cycles/kernel/osl/CMakeLists.txt +++ b/intern/cycles/kernel/osl/CMakeLists.txt @@ -25,9 +25,13 @@ set(HEADER_SRC osl_shader.h ) +set(LIB + +) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${RTTI_DISABLE_FLAGS}") include_directories(${INC}) include_directories(SYSTEM ${INC_SYS}) -cycles_add_library(cycles_kernel_osl ${SRC} ${HEADER_SRC}) +cycles_add_library(cycles_kernel_osl "${LIB}" ${SRC} ${HEADER_SRC}) |