diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-01-03 13:07:30 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-01-04 17:39:13 +0300 |
| commit | 69f40808390a4a761e414daebbfbeeacae342871 (patch) | |
| tree | 54406f1c532bcc2661bb54b119cb0223d3291f4e /extern/libmv/third_party/glog/src | |
| parent | 8608a0f4f0e17e14d0b2d560914767c776778619 (diff) | |
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
Diffstat (limited to 'extern/libmv/third_party/glog/src')
5 files changed, 8 insertions, 11 deletions
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 |