sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Cycles: Fix compilation error with enabled looging but disabled libmv

Browse Source
This commit is contained in:
Sergey Sharybin 2014-11-15 04:01:31 +05:00
parent 64ac46126b
commit fa6c45b092
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extern/libmv/CMakeLists.txt vendored
View File

@ -262,7 +262,7 @@ if(WITH_LIBMV)
endif() endif()
# make GLog a separate target, so it can be used for gtest as well. # make GLog a separate target, so it can be used for gtest as well.
if(WITH_LIBMV OR WITH_GTESTS) if(WITH_LIBMV OR WITH_GTESTS OR WITH_CYCLES_LOGGING)
# We compile GLog together with GFlag so we don't worry about # We compile GLog together with GFlag so we don't worry about
# adding extra lib to linker. # adding extra lib to linker.
set(GLOG_SRC set(GLOG_SRC

2
extern/libmv/bundle.sh vendored
View File

@ -224,7 +224,7 @@ if(WITH_LIBMV)
endif() endif()
# make GLog a separate target, so it can be used for gtest as well. # make GLog a separate target, so it can be used for gtest as well.
if(WITH_LIBMV OR WITH_GTESTS) if(WITH_LIBMV OR WITH_GTESTS OR WITH_CYCLES_LOGGING)
# We compile GLog together with GFlag so we don't worry about # We compile GLog together with GFlag so we don't worry about
# adding extra lib to linker. # adding extra lib to linker.
set(GLOG_SRC set(GLOG_SRC