Merge branch develop

wrappers/python/CMakeLists.txt

@@ -47,14 +47,6 @@ if(OS_MAC)
   endif()
 endif()
 
-# options
-
-include(${PRO_DIR}/cmake/Option.cmake)
-
-if(NOT WITH_API)
-  message(FATAL_ERROR "Must with API layer :(")
-endif()
-
 # flags
 
 if(OS_WIN)
@@ -77,14 +69,22 @@ message(STATUS "CXX_FLAGS: ${CMAKE_CXX_FLAGS}")
 
 # packages
 
-LIST(APPEND CMAKE_PREFIX_PATH ${PRO_DIR}/third_party/glog/_build)
-find_package(glog REQUIRED)
-message(STATUS "Found glog: ${glog_VERSION}")
-
 LIST(APPEND CMAKE_PREFIX_PATH ${PRO_DIR}/_install/lib/cmake)
 find_package(mynteye REQUIRED)
 message(STATUS "Found mynteye: ${mynteye_VERSION}")
 
+if(NOT mynteye_WITH_API)
+  message(FATAL_ERROR "Must with API layer :(")
+endif()
+
+include(${PRO_DIR}/cmake/DetectOpenCV.cmake)
+
+if(mynteye_WITH_GLOG)
+  include(${PRO_DIR}/cmake/DetectGLog.cmake)
+endif()
+
+## boost & python
+
 if(CMAKE_VERSION VERSION_LESS "3.10" OR CMAKE_VERSION VERSION_EQUAL "3.10")
   find_package(Boost ${BOOST_FIND_VERSION} REQUIRED
     COMPONENTS python${PYTHON_BOOST_CODE}  # numpy${PYTHON_BOOST_CODE}
@@ -103,8 +103,6 @@ message(STATUS "Found PythonLibs: ${PYTHONLIBS_VERSION_STRING}")
 message(STATUS "  PYTHON_INCLUDE_DIRS: ${PYTHON_INCLUDE_DIRS}")
 message(STATUS "  PYTHON_LIBRARIES: ${PYTHON_LIBRARIES}")
 
-include(${PRO_DIR}/cmake/DetectOpenCV.cmake)
-
 #LIST(APPEND CMAKE_MODULE_PATH ${PRO_DIR}/cmake)
 
 # targets

wrappers/python/src/mynteye_py.cc

@@ -26,7 +26,7 @@
 #include <vector>
 
 #include "mynteye/api.h"
-#include "mynteye/glog_init.h"
+#include "mynteye/logger.h"
 #include "mynteye/utils.h"
 
 #include "array_indexing_suite.hpp"
@@ -451,7 +451,7 @@ BOOST_PYTHON_MODULE(mynteye_py) {
 
   bp::register_ptr_to_python<std::shared_ptr<APIWrap>>();
 
-  // glog_init.h - glog_init
+  // logger.h - glog_init
 
   bp::class_<glog_init, boost::noncopyable>("glog_init", bp::no_init)
       .def("create", &glog_init_create)

wrappers/ros/src/mynt_eye_ros_wrapper/CMakeLists.txt

@@ -56,9 +56,6 @@ checkPackage("sensor_msgs" "")
 checkPackage("std_msgs" "")
 checkPackage("tf" "")
 
-find_package(OpenCV REQUIRED)
-message(STATUS "Found OpenCV: ${OpenCV_VERSION}")
-
 ## messages
 
 add_message_files(
@@ -82,14 +79,20 @@ catkin_package(
 
 get_filename_component(SDK_DIR "${PROJECT_SOURCE_DIR}/../../../.." ABSOLUTE)
 
-LIST(APPEND CMAKE_PREFIX_PATH ${SDK_DIR}/third_party/glog/_build)
-find_package(glog REQUIRED)
-message(STATUS "Found glog: ${glog_VERSION}")
-
 LIST(APPEND CMAKE_PREFIX_PATH ${SDK_DIR}/_install/lib/cmake)
 find_package(mynteye REQUIRED)
 message(STATUS "Found mynteye: ${mynteye_VERSION}")
 
+if(NOT mynteye_WITH_API)
+  message(FATAL_ERROR "Must with API layer :(")
+endif()
+
+include(${SDK_DIR}/cmake/DetectOpenCV.cmake)
+
+if(mynteye_WITH_GLOG)
+  include(${SDK_DIR}/cmake/DetectGLog.cmake)
+endif()
+
 # targets
 
 add_compile_options(-std=c++11)

wrappers/ros/src/mynt_eye_ros_wrapper/src/wrapper_node.cc

@@ -14,7 +14,7 @@
 #include <nodelet/loader.h>
 #include <ros/ros.h>
 
-#include "mynteye/glog_init.h"
+#include "mynteye/logger.h"
 
 int main(int argc, char *argv[]) {
   glog_init _(argc, argv);

wrappers/ros/src/mynt_eye_ros_wrapper/src/wrapper_nodelet.cc

@@ -28,8 +28,6 @@
 #include <mynt_eye_ros_wrapper/GetInfo.h>
 #include <mynt_eye_ros_wrapper/Temp.h>
 
-#include <glog/logging.h>
-
 #define _USE_MATH_DEFINES
 #include <cmath>
 #include <map>
@@ -38,6 +36,7 @@
 #include "mynteye/api.h"
 #include "mynteye/context.h"
 #include "mynteye/device.h"
+#include "mynteye/logger.h"
 
 #define FULL_PRECISION \
   std::fixed << std::setprecision(std::numeric_limits<double>::max_digits10)