diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-01-29 01:56:12 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-01-29 02:02:06 +0400 |
commit | f70d9660474c2be5f56d65247df3be5af0479e08 (patch) | |
tree | 750e3057998085a7342bdf7de95d76c85034c850 /intern/cycles/CMakeLists.txt | |
parent | 52ea13e97087f9a1d604708fe821fcf04d35aba6 (diff) |
Scons: refactor cycles kernel code to avoid building the AVX kernel with
compilers that don't support it.
CMake still needs to updated to work the same for consistency, but this should
fix the OS X buildbot at least.
Diffstat (limited to 'intern/cycles/CMakeLists.txt')
-rw-r--r-- | intern/cycles/CMakeLists.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/intern/cycles/CMakeLists.txt b/intern/cycles/CMakeLists.txt index 4e1a18adbf3..f8c4ca68572 100644 --- a/intern/cycles/CMakeLists.txt +++ b/intern/cycles/CMakeLists.txt @@ -12,6 +12,7 @@ endif() include(cmake/external_libs.cmake) # Build Flags +# todo: refactor this code to match scons if(WIN32 AND MSVC) # there is no /arch:SSE3, but intrinsics are available anyway @@ -45,6 +46,8 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ffast-math") endif() +add_definitions(-DWITH_KERNEL_SSE2 -DWITH_KERNEL_SSE3 -DWITH_KERNEL_SSE41 -DWITH_KERNEL_AVX) + # for OSL if(WIN32 AND MSVC) set(RTTI_DISABLE_FLAGS "/GR- -DBOOST_NO_RTTI -DBOOST_NO_TYPEID") |