Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2011-08-16 20:15:34 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2011-08-16 20:15:34 +0400
commit360fcd73fe2868ba32c65697e21ed1bbab8b649a (patch)
tree29c77024343a26c0358b814e581efaf388a3030a /intern/cycles/subd
parent18387f3e3fc4e3fbb9f2cd27d49d12e56975e87c (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/subd')
-rw-r--r--intern/cycles/subd/CMakeLists.txt8
1 files changed, 4 insertions, 4 deletions
diff --git a/intern/cycles/subd/CMakeLists.txt b/intern/cycles/subd/CMakeLists.txt
index 5357df4fab7..79ed73134f2 100644
--- a/intern/cycles/subd/CMakeLists.txt
+++ b/intern/cycles/subd/CMakeLists.txt
@@ -1,7 +1,7 @@
-INCLUDE_DIRECTORIES(. ../util ../kernel ../kernel/svm ../render)
+include_directories(. ../util ../kernel ../kernel/svm ../render)
-SET(sources
+set(sources
subd_build.cpp
subd_dice.cpp
subd_mesh.cpp
@@ -10,7 +10,7 @@ SET(sources
subd_split.cpp
subd_stencil.cpp)
-SET(headers
+set(headers
subd_build.h
subd_dice.h
subd_edge.h
@@ -22,5 +22,5 @@ SET(headers
subd_stencil.h
subd_vert.h)
-ADD_LIBRARY(cycles_subd ${sources} ${headers})
+add_library(cycles_subd ${sources} ${headers})