Hi Sergey, I get an error with latest master, after these changes. Scons, Windows x64.
bvh_sort.cpp extern\libmv\third_party\glog\src\windows\glog/log_severity.h(55) : fatal error C1189: #error : ERROR macro is defined. Define GLOG_NO_ABBREVIATED_SEVERITIES b efore including logging.h. See the document for detail. scons: *** [D:\blender_dev\code\build\win64-vc\intern\cycles\bvh\bvh_build.obj] Error 2 scons: building terminated because of errors. Best regards, Thomas Am 03.12.2014 um 18:47 schrieb Sergey Sharybin: > Commit: 9ae458362aefc84751b102794dd426f432fb60a6 > Author: Sergey Sharybin > Date: Wed Dec 3 22:45:12 2014 +0500 > Branches: master > https://developer.blender.org/rB9ae458362aefc84751b102794dd426f432fb60a6 > > 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. > > =================================================================== > > M CMakeLists.txt > M build_files/scons/tools/btools.py > > =================================================================== > > diff --git a/CMakeLists.txt b/CMakeLists.txt > index 87ee852..f2ffffe 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 25f7f0f..cf9962d 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)), > > _______________________________________________ > Bf-blender-cvs mailing list > [email protected] > http://lists.blender.org/mailman/listinfo/bf-blender-cvs _______________________________________________ Bf-committers mailing list [email protected] http://lists.blender.org/mailman/listinfo/bf-committers
