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 /source/creator
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 'source/creator')
-rw-r--r--source/creator/CMakeLists.txt31
1 files changed, 31 insertions, 0 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 43fec85b5bf..850be368d4a 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -407,6 +407,22 @@ if(UNIX AND NOT APPLE)
# install(CODE "execute_process(COMMAND find ${TARGETDIR}/${BLENDER_VERSION}/python/lib/ -name '*.so' -exec strip -s {} '\;')")
endif()
endif()
+
+ # XXX this is non standard
+ if(WITH_OPENIMAGEIO)
+ set(oiio_install_libs
+ ${OPENIMAGEIO_LIBPATH}/lib${OPENIMAGEIO_LIBRARY}.so
+ ${BOOST_LIBRARIES})
+
+ list(REMOVE_ITEM oiio_install_libs optimized)
+ list(REMOVE_ITEM oiio_install_libs debug)
+
+ install(
+ FILES ${oiio_install_libs}
+ DESTINATION ${TARGETDIR}
+ )
+ endif()
+
elseif(WIN32)
set(TARGETDIR_VER ${TARGETDIR}/${BLENDER_VERSION})
@@ -594,6 +610,14 @@ elseif(WIN32)
)
endif()
+ if(WITH_OPENIMAGEIO)
+ install(
+ FILES
+ ${LIBDIR}/openimageio/bin/OpenImageIO.dll
+ DESTINATION ${TARGETDIR}
+ )
+ endif()
+
elseif(APPLE)
set(SOURCEDIR ${CMAKE_SOURCE_DIR}/source/darwin/blender.app)
set(SOURCEINFO ${SOURCEDIR}/Contents/Info.plist)
@@ -704,6 +728,9 @@ elseif(APPLE)
endif()
endif()
+# install more files XXX pass target dir
+delayed_do_install(${TARGETDIR_VER})
+
unset(BLENDER_TEXT_FILES)
@@ -847,6 +874,10 @@ endif()
list(APPEND BLENDER_SORTED_LIBS bf_quicktime)
endif()
+ if(WITH_CYCLES)
+ list(APPEND BLENDER_SORTED_LIBS bf_intern_cycles)
+ endif()
+
foreach(SORTLIB ${BLENDER_SORTED_LIBS})
set(REMLIB ${SORTLIB})
foreach(SEARCHLIB ${BLENDER_LINK_LIBS})