sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity
b16bf6c3d4
blender/intern/cycles/CMakeLists.txt

167 lines
5.0 KiB
CMake
Raw Normal View History

Cycles: Add a cmake config to easily compile Cycles Standalone. On Linux/Mac OS X, simply type "make cycles" inside the Blender source directory, to get a standalone build of the engine. Reviewed by: Brecht Differential Revision: https://developer.blender.org/D228
2014-01-20 19:41:54 +00:00
# Standalone or with Blender
if(NOT WITH_BLENDER AND WITH_CYCLES_STANDALONE)
set(CYCLES_INSTALL_PATH "")
else()
set(WITH_CYCLES_BLENDER ON)
set(CYCLES_INSTALL_PATH "scripts/addons/cycles")
endif()
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
2011-08-16 16:15:34 +00:00
# External Libraries
include(cmake/external_libs.cmake)
# Build Flags
Scons: refactor cycles kernel code to avoid building the AVX kernel with compilers that don't support it. CMake still needs to updated to work the same for consistency, but this should fix the OS X buildbot at least.
2014-01-28 21:56:12 +00:00
# todo: refactor this code to match scons
CMake: disable SSE flags if gcc/clang don't support
2014-03-26 21:28:59 +00:00
# note: CXX_HAS_SSE is needed in case passing SSE flags fails altogether (gcc-arm)
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
2011-08-16 16:15:34 +00:00
Cycles * Compile all of cycles with -ffast-math again * Add scons compilation of cuda binaries, tested on mac/linux. * Add UI option for supported/experimental features, to make it more clear what is supported, opencl/subdivision is experimental. * Remove cycles xml exporter, was just for testing.
2011-12-01 16:33:21 +00:00
if(WIN32 AND MSVC)
CMake: disable SSE flags if gcc/clang don't support
2014-03-26 21:28:59 +00:00
set(CXX_HAS_SSE TRUE)
Cycles: enable /arch:AVX in msvc 11 and later versions for avx kernel This enables VEX-encoding in AVX kernel for windows msvc builds and gives 5-10% speedup for different scenes. Reviewers: juicyfruit, dingto, brecht Reviewed By: brecht CC: brecht Differential Revision: https://developer.blender.org/D284
2014-02-03 13:22:50 +00:00
# /arch:AVX for VC2012 and above
if(NOT MSVC_VERSION LESS 1700)
set(CYCLES_AVX_ARCH_FLAGS "/arch:AVX")
Cycles: Add an AVX2 CPU kernel. This kernel is compiled with AVX2, FMA3, and BMI compiler flags. At the moment only Intel Haswell benefits from this, but future AMD CPUs will have these instructions as well. Makes rendering on Haswell CPUs a few percent faster, only benchmarked with clang on OS X though. Part of my GSoC 2014.
2014-06-13 20:23:58 +00:00
set(CYCLES_AVX2_ARCH_FLAGS "/arch:AVX /arch:AVX2")
Cycles: enable /arch:AVX in msvc 11 and later versions for avx kernel This enables VEX-encoding in AVX kernel for windows msvc builds and gives 5-10% speedup for different scenes. Reviewers: juicyfruit, dingto, brecht Reviewed By: brecht CC: brecht Differential Revision: https://developer.blender.org/D284
2014-02-03 13:22:50 +00:00
elseif(NOT CMAKE_CL_64)
set(CYCLES_AVX_ARCH_FLAGS "/arch:SSE2")
Cycles: Add an AVX2 CPU kernel. This kernel is compiled with AVX2, FMA3, and BMI compiler flags. At the moment only Intel Haswell benefits from this, but future AMD CPUs will have these instructions as well. Makes rendering on Haswell CPUs a few percent faster, only benchmarked with clang on OS X though. Part of my GSoC 2014.
2014-06-13 20:23:58 +00:00
set(CYCLES_AVX2_ARCH_FLAGS "/arch:SSE2")
Cycles: enable /arch:AVX in msvc 11 and later versions for avx kernel This enables VEX-encoding in AVX kernel for windows msvc builds and gives 5-10% speedup for different scenes. Reviewers: juicyfruit, dingto, brecht Reviewed By: brecht CC: brecht Differential Revision: https://developer.blender.org/D284
2014-02-03 13:22:50 +00:00
endif()
Cycles: attempt to fix internal compile error with some visual studio builds
2013-06-18 13:19:16 +00:00
# there is no /arch:SSE3, but intrinsics are available anyway
Cleanup: * Silence /arch:SSE2 warning on msvc x64.
2013-08-31 03:18:55 +00:00
if(CMAKE_CL_64)
Cycles: fix 3-5% performance regression in msvc builds caused by a typo in stackchecking flags.
2014-03-31 17:44:02 +00:00
set(CYCLES_SSE2_KERNEL_FLAGS "/fp:fast -D_CRT_SECURE_NO_WARNINGS /GS-")
set(CYCLES_SSE3_KERNEL_FLAGS "/fp:fast -D_CRT_SECURE_NO_WARNINGS /GS-")
set(CYCLES_SSE41_KERNEL_FLAGS "/fp:fast -D_CRT_SECURE_NO_WARNINGS /GS-")
set(CYCLES_AVX_KERNEL_FLAGS "${CYCLES_AVX_ARCH_FLAGS} /fp:fast -D_CRT_SECURE_NO_WARNINGS /GS-")
Cycles: Add an AVX2 CPU kernel. This kernel is compiled with AVX2, FMA3, and BMI compiler flags. At the moment only Intel Haswell benefits from this, but future AMD CPUs will have these instructions as well. Makes rendering on Haswell CPUs a few percent faster, only benchmarked with clang on OS X though. Part of my GSoC 2014.
2014-06-13 20:23:58 +00:00
set(CYCLES_AVX2_KERNEL_FLAGS "${CYCLES_AVX2_ARCH_FLAGS} /fp:fast -D_CRT_SECURE_NO_WARNINGS /GS-")
Cleanup: * Silence /arch:SSE2 warning on msvc x64.
2013-08-31 03:18:55 +00:00
else()
Cycles: fix 3-5% performance regression in msvc builds caused by a typo in stackchecking flags.
2014-03-31 17:44:02 +00:00
set(CYCLES_SSE2_KERNEL_FLAGS "/arch:SSE2 /fp:fast -D_CRT_SECURE_NO_WARNINGS /GS-")
set(CYCLES_SSE3_KERNEL_FLAGS "/arch:SSE2 /fp:fast -D_CRT_SECURE_NO_WARNINGS /GS-")
set(CYCLES_SSE41_KERNEL_FLAGS "/arch:SSE2 /fp:fast -D_CRT_SECURE_NO_WARNINGS /GS-")
set(CYCLES_AVX_KERNEL_FLAGS "${CYCLES_AVX_ARCH_FLAGS} /fp:fast -D_CRT_SECURE_NO_WARNINGS /GS-")
Cycles: Add an AVX2 CPU kernel. This kernel is compiled with AVX2, FMA3, and BMI compiler flags. At the moment only Intel Haswell benefits from this, but future AMD CPUs will have these instructions as well. Makes rendering on Haswell CPUs a few percent faster, only benchmarked with clang on OS X though. Part of my GSoC 2014.
2014-06-13 20:23:58 +00:00
set(CYCLES_AVX2_KERNEL_FLAGS "${CYCLES_AVX2_ARCH_FLAGS} /fp:fast -D_CRT_SECURE_NO_WARNINGS /GS-")
Cleanup: * Silence /arch:SSE2 warning on msvc x64.
2013-08-31 03:18:55 +00:00
endif()
Cycles: optimized SSE BVH traversal now also works with SSE2 CPUs, so all the way back to Pentium 4, using a slightly less efficient instruction. Also ensure /Ox is used for Visual Studio for RelWithDebInfo builds.
2013-06-19 17:54:26 +00:00
Cycles: fix 3-5% performance regression in msvc builds caused by a typo in stackchecking flags.
2014-03-31 17:44:02 +00:00
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /fp:fast -D_CRT_SECURE_NO_WARNINGS /GS-")
Fix for Debug build on MSVC2008 and MSVC2012 after Cycles Kernel optimization: Compiler optimization was accidentally set to /Ox for debug build too. Changed this to be /Od in Debug and /Ox in Release mode.
2013-06-19 17:17:51 +00:00
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Ox")
Fix wrong cycles cmake + msvc build flags with relwithdebinfo and minsizerel. Patch by Karsten Schwenk.
2013-08-05 12:02:43 +00:00
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Ox")
set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} /Ox")
Cycles * Compile all of cycles with -ffast-math again * Add scons compilation of cuda binaries, tested on mac/linux. * Add UI option for supported/experimental features, to make it more clear what is supported, opencl/subdivision is experimental. * Remove cycles xml exporter, was just for testing.
2011-12-01 16:33:21 +00:00
elseif(CMAKE_COMPILER_IS_GNUCC)
CMake: disable SSE flags if gcc/clang don't support
2014-03-26 21:28:59 +00:00
check_cxx_compiler_flag(-msse CXX_HAS_SSE)
if(CXX_HAS_SSE)
set(CYCLES_SSE2_KERNEL_FLAGS "-ffast-math -msse -msse2 -mfpmath=sse")
set(CYCLES_SSE3_KERNEL_FLAGS "-ffast-math -msse -msse2 -msse3 -mssse3 -mfpmath=sse")
set(CYCLES_SSE41_KERNEL_FLAGS "-ffast-math -msse -msse2 -msse3 -mssse3 -msse4.1 -mfpmath=sse")
set(CYCLES_AVX_KERNEL_FLAGS "-ffast-math -msse -msse2 -msse3 -mssse3 -msse4.1 -mavx -mfpmath=sse")
Cycles: Fix compilation error of AVX2 kernel with GCC/Clang
2014-06-13 21:00:32 +00:00
set(CYCLES_AVX2_KERNEL_FLAGS "-ffast-math -msse -msse2 -msse3 -mssse3 -msse4.1 -mavx -mavx2 -mfma -mlzcnt -mbmi -mbmi2 -mfpmath=sse")
CMake: disable SSE flags if gcc/clang don't support
2014-03-26 21:28:59 +00:00
endif()
Cycles * Compile all of cycles with -ffast-math again * Add scons compilation of cuda binaries, tested on mac/linux. * Add UI option for supported/experimental features, to make it more clear what is supported, opencl/subdivision is experimental. * Remove cycles xml exporter, was just for testing.
2011-12-01 16:33:21 +00:00
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ffast-math")
Arrempt to fix Cycles compilation with Clang Issue is caused by missing sse flags for Clang compilers, this flags only was set for GNU C compilers. Added if branch for Clang now, which contains the same flags apart from -mfpmath=sse, This is because Clang was claiming it's unused argument. Probably OSX would need some further checks since it's also using Clang. I've got no idea why it could have worked for OSX before..
2013-07-07 18:29:57 +00:00
elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
CMake: disable SSE flags if gcc/clang don't support
2014-03-26 21:28:59 +00:00
check_cxx_compiler_flag(-msse CXX_HAS_SSE)
if(CXX_HAS_SSE)
set(CYCLES_SSE2_KERNEL_FLAGS "-ffast-math -msse -msse2")
set(CYCLES_SSE3_KERNEL_FLAGS "-ffast-math -msse -msse2 -msse3 -mssse3")
set(CYCLES_SSE41_KERNEL_FLAGS "-ffast-math -msse -msse2 -msse3 -mssse3 -msse4.1")
set(CYCLES_AVX_KERNEL_FLAGS "-ffast-math -msse -msse2 -msse3 -mssse3 -msse4.1 -mavx")
Cycles: Fix compilation error of AVX2 kernel with GCC/Clang
2014-06-13 21:00:32 +00:00
set(CYCLES_AVX2_KERNEL_FLAGS "-ffast-math -msse -msse2 -msse3 -mssse3 -msse4.1 -mavx -mavx2 -mfma -mlzcnt -mbmi -mbmi2")
CMake: disable SSE flags if gcc/clang don't support
2014-03-26 21:28:59 +00:00
endif()
Arrempt to fix Cycles compilation with Clang Issue is caused by missing sse flags for Clang compilers, this flags only was set for GNU C compilers. Added if branch for Clang now, which contains the same flags apart from -mfpmath=sse, This is because Clang was claiming it's unused argument. Probably OSX would need some further checks since it's also using Clang. I've got no idea why it could have worked for OSX before..
2013-07-07 18:29:57 +00:00
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ffast-math")
edits to cycles cmake files so cmake_consistency_check.py can parse them.
2011-11-08 20:27:37 +00:00
endif()
Cycles: hook up the CMake build system. New build instructions for Ubuntu Linux in the wiki: http://wiki.blender.org/index.php/Dev:2.5/Source/Cycles
2011-04-28 13:47:27 +00:00
CMake: disable SSE flags if gcc/clang don't support
2014-03-26 21:28:59 +00:00
if(CXX_HAS_SSE)
add_definitions(
-DWITH_KERNEL_SSE2
-DWITH_KERNEL_SSE3
-DWITH_KERNEL_SSE41
-DWITH_KERNEL_AVX
Cycles: Add an AVX2 CPU kernel. This kernel is compiled with AVX2, FMA3, and BMI compiler flags. At the moment only Intel Haswell benefits from this, but future AMD CPUs will have these instructions as well. Makes rendering on Haswell CPUs a few percent faster, only benchmarked with clang on OS X though. Part of my GSoC 2014.
2014-06-13 20:23:58 +00:00
-DWITH_KERNEL_AVX2
CMake: disable SSE flags if gcc/clang don't support
2014-03-26 21:28:59 +00:00
)
endif()
Scons: refactor cycles kernel code to avoid building the AVX kernel with compilers that don't support it. CMake still needs to updated to work the same for consistency, but this should fix the OS X buildbot at least.
2014-01-28 21:56:12 +00:00
Cycles: only use -fno-rtti with OSL (conflicts with -fsanitize=vptr)
2014-06-17 06:00:16 +00:00
if(WITH_CYCLES_OSL)
if(WIN32 AND MSVC)
set(RTTI_DISABLE_FLAGS "/GR- -DBOOST_NO_RTTI -DBOOST_NO_TYPEID")
elseif(CMAKE_COMPILER_IS_GNUCC OR (CMAKE_C_COMPILER_ID MATCHES "Clang"))
set(RTTI_DISABLE_FLAGS "-fno-rtti -DBOOST_NO_RTTI -DBOOST_NO_TYPEID")
endif()
-fno-rtti is a gcc option which gives a warning when using MSVC
2012-11-26 13:48:48 +00:00
endif()
Cycles: * Fix excessive fireflies in Velvet BSDF (patch by David). * Disable some unused SSE code * Remove RTTI disabling flags for now, this is giving some compile issues and was only needed of OSL which we're not using yet.
2011-11-10 14:32:16 +00:00
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
2011-08-16 16:15:34 +00:00
# Definitions and Includes
Code cleanup: cmake
2014-03-13 12:31:06 +00:00
add_definitions(
${BOOST_DEFINITIONS}
${OPENIMAGEIO_DEFINITIONS}
)
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
2011-08-16 16:15:34 +00:00
Code cleanup: cmake
2014-03-13 12:31:06 +00:00
add_definitions(
-DCCL_NAMESPACE_BEGIN=namespace\ ccl\ {
-DCCL_NAMESPACE_END=}
)
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
2011-08-16 16:15:34 +00:00
if(WITH_CYCLES_NETWORK)
add UNLIKELY / LIKELY util defines to help optimize iterators that are called a lot, only defined for gcc at the moment. also some cmake formatting edits.
2011-12-29 01:46:58 +00:00
add_definitions(-DWITH_NETWORK)
Cycles: hook up the CMake build system. New build instructions for Ubuntu Linux in the wiki: http://wiki.blender.org/index.php/Dev:2.5/Source/Cycles
2011-04-28 13:47:27 +00:00
endif()
Cycles Standalone: GUI flag was not passed correctly to the code, own mistake when I added the GUI build option.
2014-01-20 20:12:28 +00:00
if(WITH_CYCLES_STANDALONE_GUI)
add_definitions(-DWITH_CYCLES_STANDALONE_GUI)
endif()
Cycles: experimental OSL ptex reading code. This code can't actually be enabled for building and is incomplete, but it's here because we know we want to support this at some point and there's not much reason to have it in a separate branch if a simple #ifdef can disable it.
2013-11-28 00:38:23 +00:00
if(WITH_CYCLES_PTEX)
add_definitions(-DWITH_PTEX)
endif()
Cycles: experimental OpenSubdiv code. This code can't actually be enabled for building and is incomplete, but it's here because we know we want to support this at some point and there's not much reason to have it in a separate branch if a simple #ifdef can disable it.
2013-11-28 01:10:02 +00:00
if(WITH_CYCLES_OPENSUBDIV)
add_definitions(-DWITH_OPENSUBDIV)
endif()
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
2011-08-16 16:15:34 +00:00
if(WITH_CYCLES_OSL)
add UNLIKELY / LIKELY util defines to help optimize iterators that are called a lot, only defined for gcc at the moment. also some cmake formatting edits.
2011-12-29 01:46:58 +00:00
add_definitions(-DWITH_OSL)
Fix cycles windows link errors when building with OSL master branch.
2013-01-30 21:58:47 +00:00
add_definitions(-DOSL_STATIC_LIBRARY)
Cycles OSL: some build system tweaks to avoid global includes and definitions, which ensures there is no conflict with other libraries, and avoids full rebuild when toggling OSL on/off.
2012-10-20 12:17:45 +00:00
include_directories(${OSL_INCLUDES})
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
2011-08-16 16:15:34 +00:00
endif()
Code cleanup: cmake
2014-03-13 12:31:06 +00:00
add_definitions(
-DWITH_OPENCL
-DWITH_CUDA
-DWITH_MULTI
)
Cycles render engine, initial commit. This is the engine itself, blender modifications and build instructions will follow later. Cycles uses code from some great open source projects, many thanks them: * BVH building and traversal code from NVidia's "Understanding the Efficiency of Ray Traversal on GPUs": http://code.google.com/p/understanding-the-efficiency-of-ray-traversal-on-gpus/ * Open Shading Language for a large part of the shading system: http://code.google.com/p/openshadinglanguage/ * Blender for procedural textures and a few other nodes. * Approximate Catmull Clark subdivision from NVidia Mesh tools: http://code.google.com/p/nvidia-mesh-tools/ * Sobol direction vectors from: http://web.maths.unsw.edu.au/~fkuo/sobol/ * Film response functions from: http://www.cs.columbia.edu/CAVE/software/softlib/dorf.php
2011-04-27 11:58:34 +00:00
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
2011-08-16 16:15:34 +00:00
include_directories(
code cleanup: cycles now uses system includes for boost/oiio.. etc, so we dont get warnings from system headers.
2012-09-20 09:04:43 +00:00
SYSTEM
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
2011-08-16 16:15:34 +00:00
${BOOST_INCLUDE_DIR}
added FindOpenImageIO cmake module.
2011-09-18 04:55:22 +00:00
${OPENIMAGEIO_INCLUDE_DIRS}
OSL/cmake: the non-intrusive parts, so other os-maintainers can take code over
2012-09-24 19:06:28 +00:00
${OPENIMAGEIO_INCLUDE_DIRS}/OpenImageIO
Revert recent OpenEXR cmake/linux fix and earlier OS X fix to use GCC for AVX. Both need a better solution and break working builds.
2014-01-27 18:11:36 +00:00
${OPENEXR_INCLUDE_DIR}
Code cleanup: cmake
2014-03-13 12:31:06 +00:00
${OPENEXR_INCLUDE_DIRS}
)
Cycles render engine, initial commit. This is the engine itself, blender modifications and build instructions will follow later. Cycles uses code from some great open source projects, many thanks them: * BVH building and traversal code from NVidia's "Understanding the Efficiency of Ray Traversal on GPUs": http://code.google.com/p/understanding-the-efficiency-of-ray-traversal-on-gpus/ * Open Shading Language for a large part of the shading system: http://code.google.com/p/openshadinglanguage/ * Blender for procedural textures and a few other nodes. * Approximate Catmull Clark subdivision from NVidia Mesh tools: http://code.google.com/p/nvidia-mesh-tools/ * Sobol direction vectors from: http://web.maths.unsw.edu.au/~fkuo/sobol/ * Film response functions from: http://www.cs.columbia.edu/CAVE/software/softlib/dorf.php
2011-04-27 11:58:34 +00:00
Code cleanup: Add -Werror=float-conversion to Cycles
2014-05-02 21:22:14 +00:00
# Warnings
Fix '-Werror=float-conversion' error with gcc < 4.9, for CMake Scons is still TODO.
2014-05-03 08:54:02 +00:00
if(CMAKE_COMPILER_IS_GNUCXX)
ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS _has_cxxflag_float_conversion "-Werror=float-conversion")
unset(_has_cxxflag_float_conversion)
Code cleanup: Add -Werror=float-conversion to Cycles
2014-05-02 21:22:14 +00:00
endif()
Cycles render engine, initial commit. This is the engine itself, blender modifications and build instructions will follow later. Cycles uses code from some great open source projects, many thanks them: * BVH building and traversal code from NVidia's "Understanding the Efficiency of Ray Traversal on GPUs": http://code.google.com/p/understanding-the-efficiency-of-ray-traversal-on-gpus/ * Open Shading Language for a large part of the shading system: http://code.google.com/p/openshadinglanguage/ * Blender for procedural textures and a few other nodes. * Approximate Catmull Clark subdivision from NVidia Mesh tools: http://code.google.com/p/nvidia-mesh-tools/ * Sobol direction vectors from: http://web.maths.unsw.edu.au/~fkuo/sobol/ * Film response functions from: http://www.cs.columbia.edu/CAVE/software/softlib/dorf.php
2011-04-27 11:58:34 +00:00
# Subdirectories
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
2011-08-16 16:15:34 +00:00
if(WITH_CYCLES_BLENDER)
UI: small tweak to tooltips for enum menus, it wasn't very clear which description was for the property and which for the item.
2011-11-18 21:06:36 +00:00
add_subdirectory(blender)
code cleanup: warnings
2012-06-01 14:59:06 +00:00
endif()
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
2011-08-16 16:15:34 +00:00
Cycles / Standalone: * Rename test to standalone. Note: New CMAKE flag is WITH_CYCLES_STANDALONE.
2013-08-27 02:37:48 +00:00
if(WITH_CYCLES_STANDALONE OR WITH_CYCLES_NETWORK)
Cycles / CMake: * Removed PARTIO building code, partio code was removed already. * Include "app" dir only when building with CYCLES_TEST enabled.
2012-11-09 18:31:04 +00:00
add_subdirectory(app)
endif()
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
2011-08-16 16:15:34 +00:00
add_subdirectory(bvh)
add_subdirectory(device)
add_subdirectory(doc)
add_subdirectory(kernel)
add_subdirectory(render)
add_subdirectory(subd)
add_subdirectory(util)
Cycles: * Add back option to bundle CUDA kernel binaries with builds. * Disable runtime CUDA kernel compilation on Windows, couldn't get this working, since it seems to depend on visual studio being installed, even though for this particular case it shouldn't be needed. CMake only at the moment. * Runtime compilation on linux/mac should now work if nvcc is not installed in the default location, but available in PATH.
2011-11-10 12:52:17 +00:00
Cycles: Add a cmake config to easily compile Cycles Standalone. On Linux/Mac OS X, simply type "make cycles" inside the Blender source directory, to get a standalone build of the engine. Reviewed by: Brecht Differential Revision: https://developer.blender.org/D228
2014-01-20 19:41:54 +00:00
if(NOT WITH_BLENDER AND WITH_CYCLES_STANDALONE)
delayed_do_install(${CMAKE_BINARY_DIR}/bin)
endif()
Copy Permalink