diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2010-12-27 04:38:23 +0300 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2010-12-27 04:38:23 +0300 |
commit | 3ead3c4ff3a438202a9838843ed4000b26de62a7 (patch) | |
tree | 868c64cfcf2a5358a181f2cb88d8a534436ab9bd /source/blender/editors/render/CMakeLists.txt | |
parent | 2d1bc90eedf933820bcff744706fd16a80d1d1cb (diff) | |
parent | c4a56fda6d64faa3de7d99b29843c8affb6d5156 (diff) |
Merged changes in the trunk up to revision 33894.
A note for branch users: CMake 2.8 on 64-bit Windows Vista raised
an error in line 948 of soc-2008-mxcurioni/CMakeLists.txt due to
an invalid argument for the blender_include_dirs macro:
blender_include_dirs(${OPENGL_INCLUDE_DIR})
The command above should be:
blender_include_dirs("${OPENGL_INCLUDE_DIR}")
Diffstat (limited to 'source/blender/editors/render/CMakeLists.txt')
-rw-r--r-- | source/blender/editors/render/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/render/CMakeLists.txt b/source/blender/editors/render/CMakeLists.txt index f32a223c4b1..bfb83d12848 100644 --- a/source/blender/editors/render/CMakeLists.txt +++ b/source/blender/editors/render/CMakeLists.txt @@ -55,4 +55,4 @@ if(WITH_OPENMP) add_definitions(-DPARALLEL=1) endif() -blenderlib(bf_editor_render "${SRC}" "${INC}") +blender_add_lib(bf_editor_render "${SRC}" "${INC}") |