diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-12-01 20:33:21 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-12-01 20:33:21 +0400 |
| commit | 45de38077131b248eb52ab1863072750252a85e2 (patch) | |
| tree | ae04201f8c6600b65974d252075f0dd020423c20 /intern/cycles/CMakeLists.txt | |
| parent | f6f7e270e30946d0bb3ea4d5c556c994125e590f (diff) | |
Cycles
* Compile all of cycles with -ffast-math again
* Add scons compilation of cuda binaries, tested on mac/linux.
* Add UI option for supported/experimental features, to make it
more clear what is supported, opencl/subdivision is experimental.
* Remove cycles xml exporter, was just for testing.
Diffstat (limited to 'intern/cycles/CMakeLists.txt')
| -rw-r--r-- | intern/cycles/CMakeLists.txt | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/intern/cycles/CMakeLists.txt b/intern/cycles/CMakeLists.txt index c5c4f6b22a6..9b05d2c332d 100644 --- a/intern/cycles/CMakeLists.txt +++ b/intern/cycles/CMakeLists.txt @@ -10,12 +10,14 @@ include(cmake/external_libs.cmake) if(WITH_RAYOPTIMIZATION AND SUPPORT_SSE_BUILD) set(WITH_CYCLES_OPTIMIZED_KERNEL ON) +endif() - if(WIN32 AND MSVC) - set(CYCLES_OPTIMIZED_KERNEL_FLAGS "/arch:SSE2 -D_CRT_SECURE_NO_WARNINGS /fp:fast") - elseif(CMAKE_COMPILER_IS_GNUCC) - set(CYCLES_OPTIMIZED_KERNEL_FLAGS "-ffast-math -msse -msse2 -msse3") - endif() +if(WIN32 AND MSVC) + set(CYCLES_OPTIMIZED_KERNEL_FLAGS "/arch:SSE2 -D_CRT_SECURE_NO_WARNINGS /fp:fast /EHsc") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /fp:fast -D_CRT_SECURE_NO_WARNINGS /EHsc") +elseif(CMAKE_COMPILER_IS_GNUCC) + set(CYCLES_OPTIMIZED_KERNEL_FLAGS "-ffast-math -msse -msse2 -msse3") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ffast-math") endif() # for OSL, not needed yet |