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/device/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/device/CMakeLists.txt')
| -rw-r--r-- | intern/cycles/device/CMakeLists.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/intern/cycles/device/CMakeLists.txt b/intern/cycles/device/CMakeLists.txt index 712351b9558..55941438720 100644 --- a/intern/cycles/device/CMakeLists.txt +++ b/intern/cycles/device/CMakeLists.txt @@ -1,5 +1,5 @@ -INCLUDE_DIRECTORIES( +include_directories( . ../kernel ../kernel/svm @@ -9,7 +9,7 @@ INCLUDE_DIRECTORIES( ${OPENGL_INCLUDE_DIR} ${GLEW_INCLUDE_PATH}) -SET(sources +set(sources device.cpp device_cpu.cpp device_cuda.cpp @@ -17,10 +17,10 @@ SET(sources device_network.cpp device_opencl.cpp) -SET(headers +set(headers device.h device_intern.h device_network.h) -ADD_LIBRARY(cycles_device ${sources} ${headers}) +add_library(cycles_device ${sources} ${headers}) |