diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-03-23 17:25:27 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-03-23 17:25:27 +0300 |
| commit | 21f16bb93e1e29a9737edc5bfddcecdcbdfd9f73 (patch) | |
| tree | 3ce8a5a3ce4442f64872ad38fccbcad31379aa59 /intern | |
| parent | 8eb8aa49397fb038ffa98dbe5dc4aed86e7b3e94 (diff) | |
| parent | 4f8e407086068e3eeca50db6b37b5c8a5a358696 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/util/util_logging.h | 1 | ||||
| -rw-r--r-- | intern/libmv/CMakeLists.txt | 2 | ||||
| -rwxr-xr-x | intern/libmv/bundle.sh | 2 | ||||
| -rw-r--r-- | intern/libmv/intern/logging.cc | 2 |
4 files changed, 5 insertions, 2 deletions
diff --git a/intern/cycles/util/util_logging.h b/intern/cycles/util/util_logging.h index 492f830e67c..5c84b6593d3 100644 --- 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 diff --git a/intern/libmv/CMakeLists.txt b/intern/libmv/CMakeLists.txt index b67a23b4159..bc555fa7ff6 100644 --- 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 diff --git a/intern/libmv/bundle.sh b/intern/libmv/bundle.sh index d155d050782..093095f5f5c 100755 --- 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 diff --git a/intern/libmv/intern/logging.cc b/intern/libmv/intern/logging.cc index 863832cb72b..701881b3971 100644 --- 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" |