diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-08-16 20:15:34 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-08-16 20:15:34 +0400 |
| commit | 360fcd73fe2868ba32c65697e21ed1bbab8b649a (patch) | |
| tree | 29c77024343a26c0358b814e581efaf388a3030a /intern/cycles/render/CMakeLists.txt | |
| parent | 18387f3e3fc4e3fbb9f2cd27d49d12e56975e87c (diff) | |
Cycles:
* add some (disabled) test code for using OpenImageIO in imbuf
* link cycles, openimageio and boost into blender instead of a shared library
* some cmakefile changes to simplify the code and follow conventions better
* this may solve running cycles problems on windows XP, or give a different
and hopefully more useful error message
Diffstat (limited to 'intern/cycles/render/CMakeLists.txt')
| -rw-r--r-- | intern/cycles/render/CMakeLists.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/intern/cycles/render/CMakeLists.txt b/intern/cycles/render/CMakeLists.txt index 9a0583c48aa..c3d5ae1ea05 100644 --- a/intern/cycles/render/CMakeLists.txt +++ b/intern/cycles/render/CMakeLists.txt @@ -1,5 +1,5 @@ -INCLUDE_DIRECTORIES( +include_directories( . ../device ../kernel @@ -9,7 +9,7 @@ INCLUDE_DIRECTORIES( ../util ${GLEW_INCLUDE_PATH}) -SET(sources +set(sources attribute.cpp background.cpp buffers.cpp @@ -33,7 +33,7 @@ SET(sources svm.cpp tile.cpp) -SET(headers +set(headers attribute.h background.h buffers.h @@ -56,7 +56,7 @@ SET(headers svm.h tile.h) -SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${RTTI_DISABLE_FLAGS}") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${RTTI_DISABLE_FLAGS}") -ADD_LIBRARY(cycles_render ${sources} ${headers}) +add_library(cycles_render ${sources} ${headers}) |