diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-12-07 13:22:05 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-12-31 23:31:08 +0300 |
commit | 2382c8decd6585274d077a5acb7d9e321163e939 (patch) | |
tree | d4100df85a8d4ca181db05cdd249441ee4a4ae78 /intern/cycles/kernel/CMakeLists.txt | |
parent | 3b6b32d6a33b60255c6e40f73522a3969e5ebe04 (diff) |
Cycles: Fix compilation error with compilers which doesn't support AVX
For SSE checks still could be decoupled to be able to compile SSE2
kernel and not SSE4 depending on the CPU or so.
Diffstat (limited to 'intern/cycles/kernel/CMakeLists.txt')
-rw-r--r-- | intern/cycles/kernel/CMakeLists.txt | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/intern/cycles/kernel/CMakeLists.txt b/intern/cycles/kernel/CMakeLists.txt index f8d2ee60a3a..0b2a5436879 100644 --- a/intern/cycles/kernel/CMakeLists.txt +++ b/intern/cycles/kernel/CMakeLists.txt @@ -242,17 +242,26 @@ if(CXX_HAS_SSE) kernel_sse2.cpp kernel_sse3.cpp kernel_sse41.cpp - kernel_avx.cpp - kernel_avx2.cpp ) set_source_files_properties(kernel_sse2.cpp PROPERTIES COMPILE_FLAGS "${CYCLES_SSE2_KERNEL_FLAGS}") set_source_files_properties(kernel_sse3.cpp PROPERTIES COMPILE_FLAGS "${CYCLES_SSE3_KERNEL_FLAGS}") set_source_files_properties(kernel_sse41.cpp PROPERTIES COMPILE_FLAGS "${CYCLES_SSE41_KERNEL_FLAGS}") +endif() + +if(CXX_HAS_AVX) + list(APPEND SRC + kernel_avx.cpp + ) set_source_files_properties(kernel_avx.cpp PROPERTIES COMPILE_FLAGS "${CYCLES_AVX_KERNEL_FLAGS}") - set_source_files_properties(kernel_avx2.cpp PROPERTIES COMPILE_FLAGS "${CYCLES_AVX2_KERNEL_FLAGS}") endif() +if(CXX_HAS_AVX2) + list(APPEND SRC + kernel_avx2.cpp + ) + set_source_files_properties(kernel_avx2.cpp PROPERTIES COMPILE_FLAGS "${CYCLES_AVX2_KERNEL_FLAGS}") +endif() add_library(cycles_kernel ${SRC} ${SRC_HEADERS} ${SRC_CLOSURE_HEADERS} ${SRC_SVM_HEADERS} ${SRC_GEOM_HEADERS}) |