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/freestyle/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/freestyle/CMakeLists.txt')
| -rw-r--r-- | source/blender/freestyle/CMakeLists.txt | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/freestyle/CMakeLists.txt b/source/blender/freestyle/CMakeLists.txt index 05f7fb63218..3b051f3804a 100644 --- a/source/blender/freestyle/CMakeLists.txt +++ b/source/blender/freestyle/CMakeLists.txt @@ -24,9 +24,9 @@ # # ***** END GPL LICENSE BLOCK ***** -FILE(GLOB_RECURSE SRC *.cpp *.h) +file(GLOB_RECURSE SRC *.cpp *.h) -SET(INC +set(INC ../blenkernel ../blenloader ../blenlib ../imbuf ../makesdna ../makesrna ../python ../python/intern ../render/extern/include ../render/intern/include ../include ../src @@ -35,8 +35,8 @@ SET(INC ${PNG_INC} ) -IF(WIN32) - SET(INC ${INC} ${PTHREADS_INC}) -ENDIF(WIN32) +if(WIN32) + set(INC ${INC} ${PTHREADS_INC}) +endif(WIN32) -BLENDERLIB(bf_freestyle "${SRC}" "${INC}") +blender_add_lib(bf_freestyle "${SRC}" "${INC}") |