[Bf-blender-cvs] [92083772e73] master: Libmv: Fix warning about unused parameter in Ceres

[Sergey Sharybin]

Commit: 92083772e73a68bf74702aceb0fcb759a6b2419c
Author: Sergey Sharybin
Date:   Mon Nov 9 12:06:04 2020 +0100
Branches: master
https://developer.blender.org/rB92083772e73a68bf74702aceb0fcb759a6b2419c

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.

===================================================================

M	intern/libmv/CMakeLists.txt
M	intern/libmv/bundle.sh

===================================================================

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