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/doc | |
| 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/doc')
| -rw-r--r-- | intern/cycles/doc/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | intern/cycles/doc/license/CMakeLists.txt | 13 |
2 files changed, 14 insertions, 1 deletions
diff --git a/intern/cycles/doc/CMakeLists.txt b/intern/cycles/doc/CMakeLists.txt index 584bcc8079c..4ae0d12a060 100644 --- a/intern/cycles/doc/CMakeLists.txt +++ b/intern/cycles/doc/CMakeLists.txt @@ -1,3 +1,3 @@ -INSTALL(DIRECTORY license DESTINATION ${CYCLES_INSTALL_PATH}/cycles PATTERN ".svn" EXCLUDE) +add_subdirectory(license) diff --git a/intern/cycles/doc/license/CMakeLists.txt b/intern/cycles/doc/license/CMakeLists.txt new file mode 100644 index 00000000000..14049d4a88a --- /dev/null +++ b/intern/cycles/doc/license/CMakeLists.txt @@ -0,0 +1,13 @@ + +set(licenses + Apache_2.0.txt + Blender.txt + GPL.txt + ILM.txt + NVidia.txt + OSL.txt + Sobol.txt + readme.txt) + +delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "${licenses}" ${CYCLES_INSTALL_PATH}/license) + |