diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-03-23 17:25:27 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-03-23 17:25:27 +0300 |
commit | 21f16bb93e1e29a9737edc5bfddcecdcbdfd9f73 (patch) | |
tree | 3ce8a5a3ce4442f64872ad38fccbcad31379aa59 /extern | |
parent | 8eb8aa49397fb038ffa98dbe5dc4aed86e7b3e94 (diff) | |
parent | 4f8e407086068e3eeca50db6b37b5c8a5a358696 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'extern')
-rw-r--r-- | extern/ceres/CMakeLists.txt | 12 | ||||
-rwxr-xr-x | extern/ceres/bundle.sh | 12 | ||||
-rw-r--r-- | extern/gflags/README.blender | 5 | ||||
-rw-r--r-- | extern/gflags/src/gflags.cc | 6 | ||||
-rw-r--r-- | extern/gflags/src/gflags_completions.cc | 2 | ||||
-rw-r--r-- | extern/glog/CMakeLists.txt | 14 | ||||
-rw-r--r-- | extern/glog/README.blender | 2 | ||||
-rw-r--r-- | extern/glog/include/glog/log_severity.h (renamed from extern/glog/src/glog/log_severity.h) | 0 | ||||
-rw-r--r-- | extern/glog/include/glog/logging.h (renamed from extern/glog/src/glog/logging.h) | 7 | ||||
-rw-r--r-- | extern/glog/include/glog/raw_logging.h (renamed from extern/glog/src/glog/raw_logging.h) | 6 | ||||
-rw-r--r-- | extern/glog/include/glog/stl_logging.h (renamed from extern/glog/src/glog/stl_logging.h) | 6 | ||||
-rw-r--r-- | extern/glog/include/glog/vlog_is_on.h (renamed from extern/glog/src/glog/vlog_is_on.h) | 0 | ||||
-rw-r--r-- | extern/glog/src/windows/glog/logging.h | 2 |
13 files changed, 17 insertions, 57 deletions
diff --git a/extern/ceres/CMakeLists.txt b/extern/ceres/CMakeLists.txt index a6e9cd9c356..82695133a15 100644 --- a/extern/ceres/CMakeLists.txt +++ b/extern/ceres/CMakeLists.txt @@ -36,6 +36,8 @@ set(INC set(INC_SYS ${EIGEN3_INCLUDE_DIRS} + ${GFLAGS_INCLUDE_DIRS} + ${GLOG_INCLUDE_DIRS} ) set(SRC @@ -303,16 +305,6 @@ else() add_definitions(-DCERES_RESTRICT_SCHUR_SPECIALIZATION) endif() -if(WIN32) - list(APPEND INC - ../glog/src/windows - ) -else() - list(APPEND INC - ../glog/src - ) -endif() - add_definitions(${GFLAGS_DEFINES}) add_definitions(${GLOG_DEFINES}) add_definitions(${CERES_DEFINES}) diff --git a/extern/ceres/bundle.sh b/extern/ceres/bundle.sh index a4f703ac33d..1c9a2e729e5 100755 --- a/extern/ceres/bundle.sh +++ b/extern/ceres/bundle.sh @@ -129,6 +129,8 @@ set(INC set(INC_SYS \${EIGEN3_INCLUDE_DIRS} + \${GFLAGS_INCLUDE_DIRS} + \${GLOG_INCLUDE_DIRS} ) set(SRC @@ -145,16 +147,6 @@ else() add_definitions(-DCERES_RESTRICT_SCHUR_SPECIALIZATION) endif() -if(WIN32) - list(APPEND INC - ../glog/src/windows - ) -else() - list(APPEND INC - ../glog/src - ) -endif() - add_definitions(\${GFLAGS_DEFINES}) add_definitions(\${GLOG_DEFINES}) add_definitions(\${CERES_DEFINES}) diff --git a/extern/gflags/README.blender b/extern/gflags/README.blender index 68dba114329..c57f5ce53ca 100644 --- a/extern/gflags/README.blender +++ b/extern/gflags/README.blender @@ -17,10 +17,5 @@ Local modifications: - Applied some modifications from fork https://github.com/Nazg-Gul/gflags.git (see https://github.com/gflags/gflags/pull/129) -- Made `google::{anonymous}::FlagValue::ValueSize() const` inlined, so it does - 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.cc b/extern/gflags/src/gflags.cc index 60965d3d201..f27079862f0 100644 --- a/extern/gflags/src/gflags.cc +++ b/extern/gflags/src/gflags.cc @@ -225,7 +225,7 @@ class FlagValue { bool Equal(const FlagValue& x) const; FlagValue* New() const; // creates a new one with default value void CopyFrom(const FlagValue& x); - inline int ValueSize() const; + int ValueSize() const; // Calls the given validate-fn on value_buffer_, and returns // whatever it returns. But first casts validate_fn_proto to a @@ -485,7 +485,7 @@ void FlagValue::CopyFrom(const FlagValue& x) { } } -inline int FlagValue::ValueSize() const { +int FlagValue::ValueSize() const { if (type_ > FV_MAX_INDEX) { assert(false); // unknown type return 0; @@ -1257,7 +1257,7 @@ void CommandLineFlagParser::ValidateFlags(bool all) { } } -inline void CommandLineFlagParser::ValidateAllFlags() { +void CommandLineFlagParser::ValidateAllFlags() { ValidateFlags(true); } diff --git a/extern/gflags/src/gflags_completions.cc b/extern/gflags/src/gflags_completions.cc index c663453c59c..f7724864d58 100644 --- a/extern/gflags/src/gflags_completions.cc +++ b/extern/gflags/src/gflags_completions.cc @@ -55,8 +55,6 @@ #include <utility> #include <vector> -#include "gflags_completions.h" - #include "config.h" #include "gflags/gflags.h" #include "gflags/gflags_completions.h" diff --git a/extern/glog/CMakeLists.txt b/extern/glog/CMakeLists.txt index 59833151e4e..df64718ee95 100644 --- a/extern/glog/CMakeLists.txt +++ b/extern/glog/CMakeLists.txt @@ -23,6 +23,7 @@ # ***** END GPL LICENSE BLOCK ***** set(INC + src ../gflags/src ) @@ -70,24 +71,23 @@ if(WIN32) list(APPEND INC src/windows - src ) else() list(APPEND INC - src + include ) - 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 + + include/glog/logging.h + include/glog/log_severity.h + include/glog/raw_logging.h + include/glog/vlog_is_on.h ) endif() diff --git a/extern/glog/README.blender b/extern/glog/README.blender index c48bc468e4c..38d5ff05c86 100644 --- a/extern/glog/README.blender +++ b/extern/glog/README.blender @@ -5,3 +5,5 @@ Upstream version: 0.3.5, a6a166db069 Local modifications: * Added per-platform config.h files so no configuration-time checks for functions and so are needed. +* Added special definitions of HAVE_SNPRINTF and HAVE_LIB_GFLAGS + in Windows' specific config.h. diff --git a/extern/glog/src/glog/log_severity.h b/extern/glog/include/glog/log_severity.h index 99945a426da..99945a426da 100644 --- a/extern/glog/src/glog/log_severity.h +++ b/extern/glog/include/glog/log_severity.h diff --git a/extern/glog/src/glog/logging.h b/extern/glog/include/glog/logging.h index 7aac880a952..8238ca9610f 100644 --- a/extern/glog/src/glog/logging.h +++ b/extern/glog/include/glog/logging.h @@ -33,11 +33,6 @@ // 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_ @@ -1628,5 +1623,3 @@ GOOGLE_GLOG_DLL_DECL void InstallFailureWriter( } #endif // _LOGGING_H_ - -#endif // WIN32 diff --git a/extern/glog/src/glog/raw_logging.h b/extern/glog/include/glog/raw_logging.h index b030f7f736d..65278f62803 100644 --- a/extern/glog/src/glog/raw_logging.h +++ b/extern/glog/include/glog/raw_logging.h @@ -33,10 +33,6 @@ // 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_ @@ -187,5 +183,3 @@ 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/include/glog/stl_logging.h index bd000152738..40a15aa4578 100644 --- a/extern/glog/src/glog/stl_logging.h +++ b/extern/glog/include/glog/stl_logging.h @@ -44,10 +44,6 @@ // - 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_ @@ -222,5 +218,3 @@ 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/glog/vlog_is_on.h b/extern/glog/include/glog/vlog_is_on.h index 02b0b867097..02b0b867097 100644 --- a/extern/glog/src/glog/vlog_is_on.h +++ b/extern/glog/include/glog/vlog_is_on.h diff --git a/extern/glog/src/windows/glog/logging.h b/extern/glog/src/windows/glog/logging.h index 606831f211c..f521a2b9424 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 1 +#if 0 #include <gflags/gflags.h> #endif |