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/util | |
| 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/util')
| -rw-r--r-- | intern/cycles/util/CMakeLists.txt | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/intern/cycles/util/CMakeLists.txt b/intern/cycles/util/CMakeLists.txt index 380383e3146..4db90adc9e6 100644 --- a/intern/cycles/util/CMakeLists.txt +++ b/intern/cycles/util/CMakeLists.txt @@ -1,10 +1,10 @@ -INCLUDE_DIRECTORIES( +include_directories( . ${GLEW_INCLUDE_PATH} ${OPENGL_INCLUDE_DIR}) -SET(sources +set(sources util_cache.cpp util_cuda.cpp util_dynlib.cpp @@ -15,11 +15,11 @@ SET(sources util_time.cpp util_transform.cpp) -IF(WITH_CYCLES_TEST) - LIST(APPEND sources util_view.cpp) -ENDIF() +if(WITH_CYCLES_TEST) + list(APPEND sources util_view.cpp) +endif() -SET(headers +set(headers util_algorithm.h util_args.h util_boundbox.h @@ -49,5 +49,5 @@ SET(headers util_vector.h util_xml.h) -ADD_LIBRARY(cycles_util ${sources} ${headers}) +add_library(cycles_util ${sources} ${headers}) |