From 360fcd73fe2868ba32c65697e21ed1bbab8b649a Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Tue, 16 Aug 2011 16:15:34 +0000 Subject: 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 --- intern/cycles/doc/CMakeLists.txt | 2 +- intern/cycles/doc/license/CMakeLists.txt | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 intern/cycles/doc/license/CMakeLists.txt (limited to 'intern/cycles/doc') 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) + -- cgit v1.2.3