diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-03-23 16:32:18 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-03-23 16:38:02 +0300 |
commit | ab48e6355dfb279ac70f05637e5533548eea773a (patch) | |
tree | e64e99f489b39ed1b454b4c8ea1512ff1d825510 /intern | |
parent | 60712d12eb89fe85204f9a0dbc86e361b8ad6c58 (diff) |
Glog/gflags: Reduce amount of local modifications
With better directory layout and more proper include
statements we can avoid several local modifications,
such as changing config.h for Windows Glog and the
ones related on pass-through statements in logging
headers in Glog.
This commit also makes unused functions not-a-warning
for external code.
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 |
3 files changed, 3 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 |