diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-04-11 04:09:56 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-04-11 04:09:56 +0400 |
| commit | 3df52d4e19790df7a7a9c80e37c5724613427b86 (patch) | |
| tree | 61852324bffcf7dfe7ac4e5c37fa881e68d49e3b /source/blender/editors/render/CMakeLists.txt | |
| parent | 09c7d5aeb84443feabb5d8e03bf268cfe7a34acc (diff) | |
| parent | e37dc17991668d696497b5af70ad8133db71b107 (diff) | |
Merged changes in the trunk up to revision 36092.
Conflicts resolved:
source/blender/makesrna/SConscript
source/blender/makesrna/intern/CMakeLists.txt
source/blender/render/intern/source/pipeline.c
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 bfb83d12848..cb67026ffbd 100644 --- a/source/blender/editors/render/CMakeLists.txt +++ b/source/blender/editors/render/CMakeLists.txt @@ -32,7 +32,7 @@ set(INC ../../render/extern/include ../../windowmanager ../../../../intern/guardedalloc - ../../../../extern/glew/include + ${GLEW_INCLUDE_PATH} ../../freestyle ) |