Commit: fa6c45b092a2ee88e42fa039ac78fc02a97d9a97
Author: Sergey Sharybin
Date: Sat Nov 15 04:01:31 2014 +0500
Branches: master
https://developer.blender.org/rBfa6c45b092a2ee88e42fa039ac78fc02a97d9a97
Cycles: Fix compilation error with enabled looging but disabled libmv
===================================================================
M extern/libmv/CMakeLists.txt
M extern/libmv/bundle.sh
===================================================================
diff --git a/extern/libmv/CMakeLists.txt b/extern/libmv/CMakeLists.txt
index 69632b3..10d99a2 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 1ac377e..45b0e27 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
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
