Re-organize structure of GLog/GFlags CMake libraries

The idea is to split them into two separate targets and have dedicated include
directories list for each of them in order to avoid some annoying include header
modifications in comparison with upstream.

Reviewers: campbellbarton, juicyfruit

Differential Revision: https://developer.blender.org/D1706

8 files changed, 116 insertions, 12 deletions

diff --git a/extern/libmv/third_party/glog/AUTHORS b/extern/libmv/third_party/glog/AUTHORS
index ee92be88dcf..72959a02585 100644
--- a/extern/libmv/third_party/glog/AUTHORS
+++ b/extern/libmv/third_party/glog/AUTHORS
@@ -1,2 +1,18 @@
-opensource@google.com
+# This is the official list of glog authors for copyright purposes.
+# This file is distinct from the CONTRIBUTORS files.
+# See the latter for an explanation.
+#
+# Names should be added to this file as:
+#	Name or Organization <email address>
+# The email address is not required for organizations.
+#
+# Please keep the list sorted.
 
+Abhishek Parmar <abhishek@orng.net>
+Brian Silverman <bsilver16384@gmail.com>
+Google Inc.
+Michael Tanner <michael@tannertaxpro.com>
+romange <romange@users.noreply.github.com>
+Sergiu Dotenco <sergiu.dotenco@th-nuernberg.de>
+tbennun <tbennun@gmail.com>
+Teddy Reed <teddy@prosauce.org>
diff --git a/extern/libmv/third_party/glog/CMakeLists.txt b/extern/libmv/third_party/glog/CMakeLists.txt
new file mode 100644
index 00000000000..469df11e94b
--- /dev/null
+++ b/extern/libmv/third_party/glog/CMakeLists.txt
@@ -0,0 +1,89 @@
+# ***** BEGIN GPL LICENSE BLOCK *****
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# The Original Code is Copyright (C) 2016, Blender Foundation
+# All rights reserved.
+#
+# Contributor(s): Blender Foundation,
+#                 Sergey Sharybin
+#
+# ***** END GPL LICENSE BLOCK *****
+
+set(INC
+	src
+	../gflags
+)
+
+set(INC_SYS
+)
+
+set(SRC
+	src/logging.cc
+	src/raw_logging.cc
+	src/utilities.cc
+	src/vlog_is_on.cc
+
+	src/utilities.h
+
+	src/config.h
+	src/config_freebsd.h
+	src/config_hurd.h
+	src/config_linux.h
+	src/config_mac.h
+
+	src/base/commandlineflags.h
+	src/base/googleinit.h
+	src/base/mutex.h
+
+	src/stacktrace.h
+	src/stacktrace_generic-inl.h
+	src/stacktrace_libunwind-inl.h
+	src/stacktrace_powerpc-inl.h
+	src/stacktrace_x86_64-inl.h
+	src/stacktrace_x86-inl.h
+)
+
+if(WIN32)
+	list(APPEND SRC
+		src/windows/port.cc
+
+		src/windows/glog/raw_logging.h
+		src/windows/glog/vlog_is_on.h
+		src/windows/glog/logging.h
+		src/windows/glog/log_severity.h
+		src/windows/port.h
+		src/windows/config.h
+	)
+
+	list(APPEND INC
+		src/windows
+	)
+else()
+	list(APPEND SRC
+		src/demangle.cc
+		src/signalhandler.cc
+		src/symbolize.cc
+
+		src/demangle.h
+		src/glog/logging.h
+		src/glog/log_severity.h
+		src/glog/raw_logging.h
+		src/glog/vlog_is_on.h
+		src/symbolize.h
+	)
+endif()
+
+blender_add_lib(extern_glog "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/extern/libmv/third_party/glog/README.libmv b/extern/libmv/third_party/glog/README.libmv
index 43ee532b6eb..6e82cbbacdf 100644
--- a/extern/libmv/third_party/glog/README.libmv
+++ b/extern/libmv/third_party/glog/README.libmv
@@ -5,3 +5,5 @@ Upstream version: 0.3.4, 4d391fe
 Local modifications:
 * Added per-platform config.h files so no configuration-time
   checks for functions and so are needed.
+* Applied changes from a fork https://github.com/Nazg-Gul/glog
+  (see https://github.com/google/glog/pull/81)
diff --git a/extern/libmv/third_party/glog/src/base/commandlineflags.h b/extern/libmv/third_party/glog/src/base/commandlineflags.h
index 529540ea461..c8d50890269 100644
--- a/extern/libmv/third_party/glog/src/base/commandlineflags.h
+++ b/extern/libmv/third_party/glog/src/base/commandlineflags.h
@@ -48,7 +48,7 @@
 #ifndef BASE_COMMANDLINEFLAGS_H__
 #define BASE_COMMANDLINEFLAGS_H__
 
-#include "../config.h"
+#include "config.h"
 #include <string>
 #include <string.h>               // for memchr
 #include <stdlib.h>               // for getenv
diff --git a/extern/libmv/third_party/glog/src/base/mutex.h b/extern/libmv/third_party/glog/src/base/mutex.h
index 00da50580b3..ced2b9950ed 100644
--- a/extern/libmv/third_party/glog/src/base/mutex.h
+++ b/extern/libmv/third_party/glog/src/base/mutex.h
@@ -102,7 +102,7 @@
 #ifndef GOOGLE_MUTEX_H_
 #define GOOGLE_MUTEX_H_
 
-#include "../config.h"           // to figure out pthreads support
+#include "config.h"           // to figure out pthreads support
 
 #if defined(NO_THREADS)
   typedef int MutexType;      // to keep a lock-count
diff --git a/extern/libmv/third_party/glog/src/windows/glog/logging.h b/extern/libmv/third_party/glog/src/windows/glog/logging.h
index fec5d7672cd..50135329d77 100644
--- a/extern/libmv/third_party/glog/src/windows/glog/logging.h
+++ b/extern/libmv/third_party/glog/src/windows/glog/logging.h
@@ -54,7 +54,7 @@
 
 // Annoying stuff for windows -- makes sure clients can import these functions
 #ifndef GOOGLE_GLOG_DLL_DECL
-# if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__MINGW32__)
+# if defined(_WIN32) && !defined(__CYGWIN__)
 #   define GOOGLE_GLOG_DLL_DECL  __declspec(dllimport)
 # else
 #   define GOOGLE_GLOG_DLL_DECL
@@ -75,13 +75,13 @@
 // Note: these commands below may look like "#if 1" or "#if 0", but
 // that's because they were constructed that way at ./configure time.
 // Look at logging.h.in to see how they're calculated (based on your config).
-#if 0
+#ifdef __MINGW32__
 #include <stdint.h>             // the normal place uint16_t is defined
 #endif
-#if 0
+#ifdef __MINGW32__
 #include <sys/types.h>          // the normal place u_int16_t is defined
 #endif
-#if 0
+#ifdef __MINGW32__
 #include <inttypes.h>           // a third place for uint16_t or u_int16_t
 #endif
 
@@ -92,9 +92,6 @@
 #ifdef __MINGW32__
 #  include <stdlib.h>
 #  include <unistd.h>
-#  include <stdint.h>             // the normal place uint16_t is defined
-#  include <sys/types.h>          // the normal place u_int16_t is defined
-#  include <inttypes.h>           // a third place for uint16_t or u_int16_t
 #  define _exit(x) exit(x)
 #endif
 
diff --git a/extern/libmv/third_party/glog/src/windows/port.cc b/extern/libmv/third_party/glog/src/windows/port.cc
index a2f8395de1d..d9943254ee5 100644
--- a/extern/libmv/third_party/glog/src/windows/port.cc
+++ b/extern/libmv/third_party/glog/src/windows/port.cc
@@ -36,7 +36,7 @@
 # error You should only be including windows/port.cc in a windows environment!
 #endif
 
-#include "../config.h"
+#include "config.h"
 #include <stdarg.h>    // for va_list, va_start, va_end
 #include <string.h>    // for strstr()
 #include <assert.h>
diff --git a/extern/libmv/third_party/glog/src/windows/port.h b/extern/libmv/third_party/glog/src/windows/port.h
index 3be525e8ce9..d78a1854f46 100644
--- a/extern/libmv/third_party/glog/src/windows/port.h
+++ b/extern/libmv/third_party/glog/src/windows/port.h
@@ -41,7 +41,7 @@
 #ifndef CTEMPLATE_WINDOWS_PORT_H_
 #define CTEMPLATE_WINDOWS_PORT_H_
 
-#include "../config.h"
+#include "config.h"
 
 #ifdef _WIN32