diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-03-23 16:32:18 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-03-23 16:38:02 +0300 |
| commit | ab48e6355dfb279ac70f05637e5533548eea773a (patch) | |
| tree | e64e99f489b39ed1b454b4c8ea1512ff1d825510 /extern/ceres | |
| parent | 60712d12eb89fe85204f9a0dbc86e361b8ad6c58 (diff) | |
Glog/gflags: Reduce amount of local modifications
With better directory layout and more proper include
statements we can avoid several local modifications,
such as changing config.h for Windows Glog and the
ones related on pass-through statements in logging
headers in Glog.
This commit also makes unused functions not-a-warning
for external code.
Diffstat (limited to 'extern/ceres')
| -rw-r--r-- | extern/ceres/CMakeLists.txt | 12 | ||||
| -rwxr-xr-x | extern/ceres/bundle.sh | 12 |
2 files changed, 4 insertions, 20 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}) |