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:
authorjehuty <jehuty>2013-07-26 20:53:28 +0400
committerjehuty <jehuty>2013-07-26 20:53:28 +0400
commit3ff3b97a728e27849b95c21eaac8c66df2c3e86b (patch)
treea456be21e84889c4741ac647989ef556f86dba31 /extern/openvdb
parentaede6f983b05daeafe37b12abbc0043fd7341774 (diff)
- changed root CMakeLists.txt so OpenVDB would compile on Mac OS X;
- moved cycles_openvdb_test out of cycles/app since most internal dependencies are not shared between them, to simplify compilation; - removed -fno-rtti compilation flag since typeid is used; - re-ordered includes to cause the recently added tbb dependency to be added first, since OIIO has its own lite version of tbb, causing many symbols to remain undefined;
Diffstat (limited to 'extern/openvdb')
-rw-r--r--extern/openvdb/CMakeLists.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/extern/openvdb/CMakeLists.txt b/extern/openvdb/CMakeLists.txt
index b0361985005..7eb33cf2dc8 100644
--- a/extern/openvdb/CMakeLists.txt
+++ b/extern/openvdb/CMakeLists.txt
@@ -29,8 +29,8 @@ set(INC
set(INC_SYS
${BOOST_INCLUDE_DIR}
- ${TBB_INCLUDE_DIRS}
${OPENEXR_INCLUDE_DIR}
+ ${TBB_INCLUDE_DIRS}
${ZLIB_INCLUDE_DIRS}
)