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
path: root/extern
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2014-11-15 02:01:31 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2014-11-15 02:01:31 +0300
commitfa6c45b092a2ee88e42fa039ac78fc02a97d9a97 (patch)
tree17ed38d52e4e76a09137aa808e6f0cd790e71186 /extern
parent64ac46126be163161f211cc9dc650863b7503ac9 (diff)
Cycles: Fix compilation error with enabled looging but disabled libmv
Diffstat (limited to 'extern')
-rw-r--r--extern/libmv/CMakeLists.txt2
-rwxr-xr-xextern/libmv/bundle.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/extern/libmv/CMakeLists.txt b/extern/libmv/CMakeLists.txt
index 69632b31685..10d99a2a316 100644
--- a/extern/libmv/CMakeLists.txt
+++ b/extern/libmv/CMakeLists.txt
@@ -262,7 +262,7 @@ if(WITH_LIBMV)
endif()
# 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
# adding extra lib to linker.
set(GLOG_SRC
diff --git a/extern/libmv/bundle.sh b/extern/libmv/bundle.sh
index 1ac377e17fe..45b0e27f126 100755
--- a/extern/libmv/bundle.sh
+++ b/extern/libmv/bundle.sh
@@ -224,7 +224,7 @@ if(WITH_LIBMV)
endif()
# 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
# adding extra lib to linker.
set(GLOG_SRC