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:
authorSergey Sharybin <sergey.vfx@gmail.com>2014-12-03 20:45:12 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2014-12-03 20:46:56 +0300
commit9ae458362aefc84751b102794dd426f432fb60a6 (patch)
tree88f2b64928551b812e2c5a12df54a990fc943e74
parent627f27502f931c298dd42137c58be51b06a1de36 (diff)
Cycles: Enable logging by default
Default configuration already includes libmv and glog, so all the dependencies are met. And logging is nice to have anyway. This wouldn't give any slowdown, because all the logging is silenced unless '--debug-cycles', plus no logging is done from the speed critical code.
-rw-r--r--CMakeLists.txt2
-rw-r--r--build_files/scons/tools/btools.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 87ee8526fc9..f2ffffeec31 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -351,7 +351,7 @@ option(WITH_CYCLES_CUDA_BINARIES "Build cycles CUDA binaries" OFF)
set(CYCLES_CUDA_BINARIES_ARCH sm_20 sm_21 sm_30 sm_35 sm_50 CACHE STRING "CUDA architectures to build binaries for")
mark_as_advanced(CYCLES_CUDA_BINARIES_ARCH)
unset(PLATFORM_DEFAULT)
-option(WITH_CYCLES_LOGGING "Build cycles with logging support" OFF)
+option(WITH_CYCLES_LOGGING "Build cycles with logging support" ON)
option(WITH_CYCLES_DEBUG "Build cycles with extra debug capabilities" OFF)
mark_as_advanced(WITH_CYCLES_LOGGING)
mark_as_advanced(WITH_CYCLES_DEBUG)
diff --git a/build_files/scons/tools/btools.py b/build_files/scons/tools/btools.py
index 25f7f0fb3d1..cf9962d1bff 100644
--- a/build_files/scons/tools/btools.py
+++ b/build_files/scons/tools/btools.py
@@ -605,7 +605,7 @@ def read_opts(env, cfg, args):
('BF_CYCLES_CUDA_ENV', 'preset environement nvcc will execute in', ''),
('BF_CYCLES_CUDA_BINARIES_ARCH', 'CUDA architectures to compile binaries for', []),
(BoolVariable('WITH_BF_CYCLES_DEBUG', 'Build Cycles engine with extra debugging capabilities', False)),
- (BoolVariable('WITH_BF_CYCLES_LOGGING', 'Build Cycles engine with logging support', False)),
+ (BoolVariable('WITH_BF_CYCLES_LOGGING', 'Build Cycles engine with logging support', True)),
(BoolVariable('WITH_BF_OIIO', 'Build with OpenImageIO', False)),
(BoolVariable('WITH_BF_STATICOIIO', 'Statically link to OpenImageIO', False)),