diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2010-12-18 14:49:12 +0300 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2010-12-18 14:49:12 +0300 |
| commit | 3368a595dae178dcdf025523232e0961b4ced61e (patch) | |
| tree | b970e27e9da9da4c00812d3c8bff27271ee275ca /source/blender/render/CMakeLists.txt | |
| parent | c4e41d7371522b46fb14cf8d809d5e3d470a1457 (diff) | |
| parent | a93411629811ec20f576895c0cb515b9abd7ec19 (diff) | |
Merged changes in the trunk up to revision 33765.
Diffstat (limited to 'source/blender/render/CMakeLists.txt')
| -rw-r--r-- | source/blender/render/CMakeLists.txt | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/source/blender/render/CMakeLists.txt b/source/blender/render/CMakeLists.txt index dac495bb4c8..82e5b7511a4 100644 --- a/source/blender/render/CMakeLists.txt +++ b/source/blender/render/CMakeLists.txt @@ -25,9 +25,9 @@ # ***** END GPL LICENSE BLOCK ***** # remove warning until render branch merged. -REMOVE_STRICT_FLAGS() +remove_strict_flags() -SET(INC +set(INC intern/include extern/include ../blenlib @@ -42,7 +42,7 @@ SET(INC ../freestyle ) -SET(SRC +set(SRC intern/raytrace/rayobject.cpp intern/raytrace/rayobject_qbvh.cpp intern/raytrace/rayobject_rtbuild.cpp @@ -112,20 +112,20 @@ SET(SRC intern/raytrace/vbvh.h ) -IF(WITH_IMAGE_OPENEXR) - ADD_DEFINITIONS(-DWITH_OPENEXR) -ENDIF(WITH_IMAGE_OPENEXR) +if(WITH_IMAGE_OPENEXR) + add_definitions(-DWITH_OPENEXR) +endif() -IF(WITH_CODEC_QUICKTIME) - LIST(APPEND INC ../quicktime ${QUICKTIME_INC}) - ADD_DEFINITIONS(-DWITH_QUICKTIME) -ENDIF(WITH_CODEC_QUICKTIME) +if(WITH_CODEC_QUICKTIME) + list(APPEND INC ../quicktime ${QUICKTIME_INC}) + add_definitions(-DWITH_QUICKTIME) +endif() -IF(APPLE) - IF(CMAKE_OSX_ARCHITECTURES MATCHES "i386" OR CMAKE_OSX_ARCHITECTURES MATCHES "x86_64") - SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -mfpmath=sse") - SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -mfpmath=sse") - ENDIF(CMAKE_OSX_ARCHITECTURES MATCHES "i386" OR CMAKE_OSX_ARCHITECTURES MATCHES "x86_64") -ENDIF(APPLE) +if(APPLE) + if(CMAKE_OSX_ARCHITECTURES MATCHES "i386" OR CMAKE_OSX_ARCHITECTURES MATCHES "x86_64") + set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -mfpmath=sse") + set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -mfpmath=sse") + endif() +endif() -BLENDERLIB_NOLIST(bf_render "${SRC}" "${INC}") +blenderlib_nolist(bf_render "${SRC}" "${INC}") |