Merge branch 'master' into blender2.8

2018-03-23 15:25:27 +01:00
parent 8eb8aa4939 4f8e407086
commit 21f16bb93e
19 changed files with 47 additions and 73 deletions
--- a/intern/cycles/util/util_logging.h
+++ b/intern/cycles/util/util_logging.h
@@ -18,6 +18,7 @@
 #define __UTIL_LOGGING_H__

 #if defined(WITH_CYCLES_LOGGING) && !defined(__KERNEL_GPU__)
+#  include <gflags/gflags.h>
 #  include <glog/logging.h>
 #endif

--- a/intern/libmv/CMakeLists.txt
+++ b/intern/libmv/CMakeLists.txt
@@ -45,7 +45,7 @@ if(WITH_LIBMV)

 	list(APPEND INC
 		${GFLAGS_INCLUDE_DIRS}
-		../../extern/glog/src
+		${GLOG_INCLUDE_DIRS}
 		../../extern/ceres/include
 		../../extern/ceres/config
 		../guardedalloc
--- a/intern/libmv/bundle.sh
+++ b/intern/libmv/bundle.sh
@@ -124,7 +124,7 @@ if(WITH_LIBMV)

 	list(APPEND INC
 		\${GFLAGS_INCLUDE_DIRS}
-		../../extern/glog/src
+		\${GLOG_INCLUDE_DIRS}
 		../../extern/ceres/include
 		../../extern/ceres/config
 		../guardedalloc
--- a/intern/libmv/intern/logging.cc
+++ b/intern/libmv/intern/logging.cc
@@ -24,6 +24,8 @@
 * ***** END GPL LICENSE BLOCK *****
 */

+#include <gflags/gflags.h>
+
 #include "intern/logging.h"
 #include "intern/utildefines.h"
 #include "libmv/logging/logging.h"