From 813e470eac309a78d1f8cdc4a3abb0314b0ee5f3 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 16 Apr 2019 06:11:27 +0200 Subject: CMake: cleanup, arg rename, add definitions last --- intern/cycles/kernel/CMakeLists.txt | 6 +++++- intern/cycles/kernel/osl/CMakeLists.txt | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) (limited to 'intern/cycles/kernel') 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}) -- cgit v1.2.3