sfm: support ng-log

Author: Kumataro

modules/sfm/CMakeLists.txt

@@ -9,10 +9,23 @@ find_package(Ceres QUIET)
 if(NOT Gflags_FOUND)  # Ceres find gflags on the own, so separate search isn't necessary
   find_package(Gflags QUIET)
 endif()
+if(NOT (Ng-log_FOUND OR ng-log_FOUND))
+  find_package(ng-log QUIET)
+endif()
 if(NOT (Glog_FOUND OR glog_FOUND))  # Ceres find glog on the own, so separate search isn't necessary
   find_package(Glog QUIET)
 endif()
 
+if(Ng-log_FOUND OR ng-log_FOUND)
+  if(NOT (Glog_FOUND OR glog_FOUND))
+    message(STATUS "sfm: ng-log is detected, but Google glog is not. ng-log(ver 0.9.x or later) is used")
+    set(glog_FOUND ON)
+    get_property(GLOG_INCLUDE_DIR TARGET ng-log::ng-log PROPERTY INTERFACE_INCLUDE_DIRECTORIES)
+  else()
+    message(STATUS "sfm: Both ng-log and Google glog are detected. Google glog or ng-log(ver 0.8.x) is used")
+  endif()
+endif()
+
 if(NOT Gflags_FOUND OR NOT (Glog_FOUND OR glog_FOUND))
   # try local search scripts
   list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
@@ -35,14 +48,21 @@ endif()
 if(NOT DEFINED GLOG_INCLUDE_DIRS AND DEFINED GLOG_INCLUDE_DIR)
   set(GLOG_INCLUDE_DIRS "${GLOG_INCLUDE_DIR}")
 endif()
+if(NOT GLOG_LIBRARIES AND TARGET ng-log::ng-log)
+  set(GLOG_NAME "ng-log")
+  set(GLOG_LIBRARIES ng-log::ng-log)
+  add_definitions("-DNGLOG_FOUND=1")
+endif()
 if(NOT GLOG_LIBRARIES AND TARGET glog::glog)
+  set(GLOG_NAME "glog")
   set(GLOG_LIBRARIES glog::glog)
+  message(STATUS "Google glog is deprecated, ng-log is recommended.")
 endif()
 
 if((gflags_FOUND OR Gflags_FOUND OR GFLAGS_FOUND OR GFLAGS_INCLUDE_DIRS) AND (glog_FOUND OR Glog_FOUND OR GLOG_FOUND OR GLOG_INCLUDE_DIRS))
   set(__cache_key "${GLOG_INCLUDE_DIRS} ~ ${GFLAGS_INCLUDE_DIRS} ~ ${GLOG_LIBRARIES} ~ ${GFLAGS_LIBRARIES}")
   if(NOT DEFINED SFM_GLOG_GFLAGS_TEST_CACHE_KEY OR NOT (SFM_GLOG_GFLAGS_TEST_CACHE_KEY STREQUAL __cache_key))
-    set(__fname "${CMAKE_CURRENT_LIST_DIR}/cmake/checks/check_glog_gflags.cpp")
+    set(__fname "${CMAKE_CURRENT_LIST_DIR}/cmake/checks/check_${GLOG_NAME}_gflags.cpp")
     try_compile(
         SFM_GLOG_GFLAGS_TEST "${CMAKE_BINARY_DIR}" "${__fname}"
         CMAKE_FLAGS "-DINCLUDE_DIRECTORIES:STRING=${GLOG_INCLUDE_DIRS};${GFLAGS_INCLUDE_DIRS}"
@@ -57,7 +77,7 @@ if((gflags_FOUND OR Gflags_FOUND OR GFLAGS_FOUND OR GFLAGS_INCLUDE_DIRS) AND (gl
     endif()
     set(SFM_GLOG_GFLAGS_TEST "${SFM_GLOG_GFLAGS_TEST}" CACHE INTERNAL "")
     set(SFM_GLOG_GFLAGS_TEST_CACHE_KEY "${__cache_key}" CACHE INTERNAL "")
-    message(STATUS "Checking SFM glog/gflags deps... ${SFM_GLOG_GFLAGS_TEST}")
+    message(STATUS "Checking SFM ${GLOG_NAME}/gflags deps... ${SFM_GLOG_GFLAGS_TEST}")
   endif()
   unset(__cache_key)
   set(SFM_DEPS_OK "${SFM_GLOG_GFLAGS_TEST}")

modules/sfm/README.md

@@ -11,9 +11,10 @@ Before compiling, take a look at the following details in order to give a proper
 
 In addition, it depends on some open source libraries:
 
-- [Eigen](http://eigen.tuxfamily.org/index.php?title=Main_Page) 3.2.2 or later. **Required**
-- [Google Log](http://code.google.com/p/google-glog) 0.3.1 or later. **Required**
-- [Google Flags](http://code.google.com/p/gflags). **Required**
+- [Eigen](https://eigen.tuxfamily.org/index.php?title=Main_Page) 3.2.2 or later. **Required**
+- [ng-log](https://github.com/ng-log/ng-log) 0.9.0 or later. **Required, use instead of Google glog**
+- [Google Logging Library(glog)](https://github.com/google/glog) 0.3.1 or later. **Not recommended**
+- [Google Flags](https://github.com/gflags/gflags). **Required**
 - [Ceres Solver](http://ceres-solver.org). Needed by the reconstruction API in order to solve part of the Bundle Adjustment plus the points Intersect. If Ceres Solver is not installed on your system, the reconstruction funcionality will be disabled. **Recommended**
 
 Installation
@@ -30,8 +31,10 @@ Start by installing all the dependencies.
 
     # CMake
     sudo apt-get install cmake
-    # google-glog + gflags
-    sudo apt-get install libgoogle-glog-dev
+    # gflags
+    sudo apt-get install libgflag-dev
+    # google-glog(not recommended)
+    # sudo apt-get install libgoogle-glog-dev
     # BLAS & LAPACK
     sudo apt-get install libatlas-base-dev
     # Eigen3
@@ -47,6 +50,15 @@ Start by installing all the dependencies.
     sudo apt-get update
     sudo apt-get install libsuitesparse-dev
 
+We are now ready to build, test, and install ng-log.
+    git clone https://github.com/ng-log/ng-log.git
+    cd ng-log
+    mkdir build && cd build
+    cmake ..
+    make -j4
+    make test
+    sudo make install
+
 We are now ready to build, test, and install Ceres.
 
     git clone https://ceres-solver.googlesource.com/ceres-solver
@@ -116,3 +128,4 @@ Future Work
 * Decide which functions are kept since most of them are the same in calib3d.
 * Finish to implement computeOrientation().
 * Find a good features matchig algorithm for reconstruction() in case we provide pure images for autocalibration (look into OpenMVG).
+* If Ceres supports ng-log, update CMakeFile.txt to drop supporting Google glog.

modules/sfm/cmake/checks/check_ng-log_gflags.cpp

@@ -0,0 +1,7 @@
+#include <ng-log/logging.h>
+#include <gflags/gflags.h>
+int main()
+{
+    (void)(0);
+    return 0;
+}

modules/sfm/src/libmv_light/libmv/logging/logging.h

@@ -21,7 +21,11 @@
 #ifndef LIBMV_LOGGING_LOGGING_H
 #define LIBMV_LOGGING_LOGGING_H
 
+#if NGLOG_FOUND
+#include <ng-log/logging.h>
+#else
 #include <glog/logging.h>
+#endif
 
 
 #if defined _MSC_VER && _MSC_VER < 1900