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
diff options
context:
space:
mode:
authorSergey Sharybin <sergey@blender.org>2020-11-09 14:06:04 +0300
committerSergey Sharybin <sergey@blender.org>2020-11-09 14:12:00 +0300
commit92083772e73a68bf74702aceb0fcb759a6b2419c (patch)
tree0d8052d2f3ef1a79561e72b4020556e34f18619e /intern/libmv
parentf26e267770ac3b1bcf3f3259cee75d3f65e49bf1 (diff)
Libmv: Fix warning about unused parameter in Ceres
Ceres is an external library, so consider it a system header which makes it so all strict flags are properly ignored for them.
Diffstat (limited to 'intern/libmv')
-rw-r--r--intern/libmv/CMakeLists.txt4
-rwxr-xr-xintern/libmv/bundle.sh4
2 files changed, 4 insertions, 4 deletions
diff --git a/intern/libmv/CMakeLists.txt b/intern/libmv/CMakeLists.txt
index b372cfe92bb..6fcf664d1f5 100644
--- a/intern/libmv/CMakeLists.txt
+++ b/intern/libmv/CMakeLists.txt
@@ -51,8 +51,6 @@ if(WITH_LIBMV)
list(APPEND INC
${GFLAGS_INCLUDE_DIRS}
${GLOG_INCLUDE_DIRS}
- ../../extern/ceres/include
- ../../extern/ceres/config
../guardedalloc
)
@@ -60,6 +58,8 @@ if(WITH_LIBMV)
${EIGEN3_INCLUDE_DIRS}
${PNG_INCLUDE_DIRS}
${ZLIB_INCLUDE_DIRS}
+ ../../extern/ceres/include
+ ../../extern/ceres/config
)
list(APPEND LIB
diff --git a/intern/libmv/bundle.sh b/intern/libmv/bundle.sh
index 48da102b801..db8f88845a8 100755
--- a/intern/libmv/bundle.sh
+++ b/intern/libmv/bundle.sh
@@ -127,8 +127,6 @@ if(WITH_LIBMV)
list(APPEND INC
\${GFLAGS_INCLUDE_DIRS}
\${GLOG_INCLUDE_DIRS}
- ../../extern/ceres/include
- ../../extern/ceres/config
../guardedalloc
)
@@ -136,6 +134,8 @@ if(WITH_LIBMV)
\${EIGEN3_INCLUDE_DIRS}
\${PNG_INCLUDE_DIRS}
\${ZLIB_INCLUDE_DIRS}
+ ../../extern/ceres/include
+ ../../extern/ceres/config
)
list(APPEND LIB