[Bf-blender-cvs] [66671f1] master: Cycles: fix for building with cmake when gcc refuses sse args
Campbell Barton
noreply at git.blender.org
Thu Mar 27 00:44:35 CET 2014
Commit: 66671f1aaecdbab932cbdff8c5e527083f5d2bc1
Author: Campbell Barton
Date: Thu Mar 27 10:15:36 2014 +1100
https://developer.blender.org/rB66671f1aaecdbab932cbdff8c5e527083f5d2bc1
Cycles: fix for building with cmake when gcc refuses sse args
===================================================================
M intern/cycles/kernel/CMakeLists.txt
===================================================================
diff --git a/intern/cycles/kernel/CMakeLists.txt b/intern/cycles/kernel/CMakeLists.txt
index 794a0f1..ebeebe2 100644
--- a/intern/cycles/kernel/CMakeLists.txt
+++ b/intern/cycles/kernel/CMakeLists.txt
@@ -12,10 +12,6 @@ set(INC_SYS
set(SRC
kernel.cpp
- kernel_sse2.cpp
- kernel_sse3.cpp
- kernel_sse41.cpp
- kernel_avx.cpp
kernel.cl
kernel.cu
)
@@ -211,10 +207,20 @@ endif()
include_directories(${INC})
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}")
-set_source_files_properties(kernel_sse41.cpp PROPERTIES COMPILE_FLAGS "${CYCLES_SSE41_KERNEL_FLAGS}")
-set_source_files_properties(kernel_avx.cpp PROPERTIES COMPILE_FLAGS "${CYCLES_AVX_KERNEL_FLAGS}")
+if(CXX_HAS_SSE)
+ list(APPEND SRC
+ kernel_sse2.cpp
+ kernel_sse3.cpp
+ kernel_sse41.cpp
+ kernel_avx.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}")
+ set_source_files_properties(kernel_avx.cpp PROPERTIES COMPILE_FLAGS "${CYCLES_AVX_KERNEL_FLAGS}")
+endif()
+
add_library(cycles_kernel ${SRC} ${SRC_HEADERS} ${SRC_CLOSURE_HEADERS} ${SRC_SVM_HEADERS})
More information about the Bf-blender-cvs
mailing list