Merge branch 'master' into blender2.8

9 files changed, 42 insertions, 3 deletions

diff --git a/extern/gflags/README.blender b/extern/gflags/README.blender
index 1f6f0111776..68dba114329 100644
--- a/extern/gflags/README.blender
+++ b/extern/gflags/README.blender
@@ -21,3 +21,6 @@ Local modifications:
   not trigger strict compiler warning.
 
 - Did the same for CommandLineFlagParser::ValidateFlags().
+
+- Ifdef-ed __attribute((unused)) in gflags.h.
+  This file is compile-time configurable in upstream, so can not avoid change here.
diff --git a/extern/gflags/src/gflags/gflags.h b/extern/gflags/src/gflags/gflags.h
index 02b40e158dc..d5401f4f575 100644
--- a/extern/gflags/src/gflags/gflags.h
+++ b/extern/gflags/src/gflags/gflags.h
@@ -285,7 +285,11 @@ class GFLAGS_DLL_DECL FlagSaver {
 
   FlagSaver(const FlagSaver&);  // no copying!
   void operator=(const FlagSaver&);
-}__attribute((unused));
+}
+#ifdef __GNUC__
+__attribute((unused))
+#endif
+;
 
 // --------------------------------------------------------------------
 // Some deprecated or hopefully-soon-to-be-deprecated functions.
diff --git a/extern/glog/CMakeLists.txt b/extern/glog/CMakeLists.txt
index 32f4dca77e8..59833151e4e 100644
--- a/extern/glog/CMakeLists.txt
+++ b/extern/glog/CMakeLists.txt
@@ -23,7 +23,6 @@
 # ***** END GPL LICENSE BLOCK *****
 
 set(INC
-	src
 	../gflags/src
 )
 
@@ -71,8 +70,13 @@ if(WIN32)
 
 	list(APPEND INC
 		src/windows
+		src
 	)
 else()
+	list(APPEND INC
+		src
+	)
+
 	list(APPEND SRC
 		src/demangle.cc
 		src/signalhandler.cc
diff --git a/extern/glog/src/config.h b/extern/glog/src/config.h
index f5c9c0b0a7b..2703b7ba9dd 100644
--- a/extern/glog/src/config.h
+++ b/extern/glog/src/config.h
@@ -14,4 +14,6 @@
  #include "windows/config.h"
 #elif defined(__GNU__)
  #include "config_hurd.h"
+#elif defined(__HAIKU__)
+ #include "config_haiku.h"
 #endif
diff --git a/extern/glog/src/glog/logging.h b/extern/glog/src/glog/logging.h
index 8238ca9610f..7aac880a952 100644
--- a/extern/glog/src/glog/logging.h
+++ b/extern/glog/src/glog/logging.h
@@ -33,6 +33,11 @@
 // Pretty much everybody needs to #include this file so that they can
 // log various happenings.
 //
+
+#ifdef WIN32
+#  include "windows/glog/logging.h"
+#else  // WIN32
+
 #ifndef _LOGGING_H_
 #define _LOGGING_H_
 
@@ -1623,3 +1628,5 @@ GOOGLE_GLOG_DLL_DECL void InstallFailureWriter(
 }
 
 #endif // _LOGGING_H_
+
+#endif  // WIN32
diff --git a/extern/glog/src/glog/raw_logging.h b/extern/glog/src/glog/raw_logging.h
index 65278f62803..b030f7f736d 100644
--- a/extern/glog/src/glog/raw_logging.h
+++ b/extern/glog/src/glog/raw_logging.h
@@ -33,6 +33,10 @@
 // acquire any locks, and can therefore be used by low-level memory
 // allocation and synchronization code.
 
+#ifdef WIN32
+#  include "windows/glog/raw_logging.h"
+#else  // WIN32
+
 #ifndef BASE_RAW_LOGGING_H_
 #define BASE_RAW_LOGGING_H_
 
@@ -183,3 +187,5 @@ GOOGLE_GLOG_DLL_DECL void RawLog__SetLastTime(const struct tm& t, int usecs);
 }
 
 #endif  // BASE_RAW_LOGGING_H_
+
+#endif  // WIN32
diff --git a/extern/glog/src/glog/stl_logging.h b/extern/glog/src/glog/stl_logging.h
index 40a15aa4578..bd000152738 100644
--- a/extern/glog/src/glog/stl_logging.h
+++ b/extern/glog/src/glog/stl_logging.h
@@ -44,6 +44,10 @@
 // - GLOG_STL_LOGGING_FOR_EXT_SLIST     - <ext/slist>
 //
 
+#ifdef WIN32
+#  include "windows/glog/stl_logging.h"
+#else  // WIN32
+
 #ifndef UTIL_GTL_STL_LOGGING_INL_H_
 #define UTIL_GTL_STL_LOGGING_INL_H_
 
@@ -218,3 +222,5 @@ inline void PrintSequence(std::ostream& out, Iter begin, Iter end) {
 namespace std { using ::operator<<; }
 
 #endif  // UTIL_GTL_STL_LOGGING_INL_H_
+
+#endif  // WIN32
diff --git a/extern/glog/src/windows/config.h b/extern/glog/src/windows/config.h
index 2d23fb08159..1cc2533daa5 100644
--- a/extern/glog/src/windows/config.h
+++ b/extern/glog/src/windows/config.h
@@ -1,5 +1,8 @@
 /* src/config.h.in.  Generated from configure.ac by autoheader.  */
 
+/* define if you have google gflags library */
+#define HAVE_LIB_GFLAGS 1
+
 /* Namespace for Google classes */
 #define GOOGLE_NAMESPACE google
 
@@ -9,6 +12,10 @@
 /* Puts following code inside the Google namespace */
 #define _START_GOOGLE_NAMESPACE_ namespace google {
 
+#if defined(__MINGW32__) || (defined(_MSC_VER) && (_MSC_VER >= 1900))
+#  define HAVE_SNPRINTF
+#endif
+
 /* Always the empty-string on non-windows systems. On windows, should be
    "__declspec(dllexport)". This way, when we compile the dll, we export our
    functions/classes. It's safe to define this here because config.h is only
diff --git a/extern/glog/src/windows/glog/logging.h b/extern/glog/src/windows/glog/logging.h
index f521a2b9424..606831f211c 100644
--- a/extern/glog/src/windows/glog/logging.h
+++ b/extern/glog/src/windows/glog/logging.h
@@ -86,7 +86,7 @@
 #include <inttypes.h>           // a third place for uint16_t or u_int16_t
 #endif
 
-#if 0
+#if 1
 #include <gflags/gflags.h>
 #endif