[Bf-blender-cvs] [993b946] master: DingTo forgot to make sure kernel_sse41 is compiled in even when empty
Martijn Berger
noreply at git.blender.org
Tue Jan 14 21:49:54 CET 2014
Commit: 993b946681d91178eb318973da3db33428bc58a0
Author: Martijn Berger
Date: Tue Jan 14 21:49:48 2014 +0100
https://developer.blender.org/rB993b946681d91178eb318973da3db33428bc58a0
DingTo forgot to make sure kernel_sse41 is compiled in even when empty
===================================================================
M intern/cycles/kernel/CMakeLists.txt
===================================================================
diff --git a/intern/cycles/kernel/CMakeLists.txt b/intern/cycles/kernel/CMakeLists.txt
index 81499bb..780aa41 100644
--- a/intern/cycles/kernel/CMakeLists.txt
+++ b/intern/cycles/kernel/CMakeLists.txt
@@ -14,6 +14,7 @@ set(SRC
kernel.cpp
kernel_sse2.cpp
kernel_sse3.cpp
+ kernel_sse41.cpp
kernel.cl
kernel.cu
)
@@ -194,13 +195,7 @@ include_directories(SYSTEM ${INC_SYS})
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}")
-
-if(WITH_CYCLES_OPTIMIZED_KERNEL_SSE41)
- set_source_files_properties(kernel_sse41.cpp PROPERTIES COMPILE_FLAGS "${CYCLES_SSE41_KERNEL_FLAGS}")
- list(APPEND SRC
- kernel_sse41.cpp
- )
-endif()
+set_source_files_properties(kernel_sse41.cpp PROPERTIES COMPILE_FLAGS "${CYCLES_SSE41_KERNEL_FLAGS}")
add_library(cycles_kernel ${SRC} ${SRC_HEADERS} ${SRC_CLOSURE_HEADERS} ${SRC_SVM_HEADERS})
More information about the Bf-blender-cvs
mailing list