Add miniglog

2018-11-16 16:30:13 +08:00
parent 8331b8415d
commit 2096f93a92
80 changed files with 1948 additions and 313 deletions
--- a/samples/CMakeLists.txt
+++ b/samples/CMakeLists.txt
@@ -47,9 +47,6 @@ 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)
@@ -57,6 +54,10 @@ message(STATUS "Found mynteye: ${mynteye_VERSION}")

 include(${PRO_DIR}/cmake/DetectOpenCV.cmake)

+if(mynteye_WITH_GLOG)
+  include(${PRO_DIR}/cmake/DetectGLog.cmake)
+endif()
+
 #LIST(APPEND CMAKE_MODULE_PATH ${PRO_DIR}/cmake)

 # targets
--- a/samples/api/camera.cc
+++ b/samples/api/camera.cc
@@ -13,8 +13,7 @@
 // limitations under the License.
 #include <opencv2/highgui/highgui.hpp>

-#include <glog/logging.h>
-
+#include "mynteye/logger.h"
 #include "mynteye/api.h"
 #include "mynteye/times.h"

--- a/samples/api/get_depth_with_region.cc
+++ b/samples/api/get_depth_with_region.cc
@@ -14,8 +14,6 @@
 #include <opencv2/highgui/highgui.hpp>
 #include <opencv2/imgproc/imgproc.hpp>

-#include <glog/logging.h>
-
 #include "mynteye/api.h"

 #define WIN_FLAGS \
--- a/samples/device/camera.cc
+++ b/samples/device/camera.cc
@@ -14,7 +14,7 @@
 #include <opencv2/highgui/highgui.hpp>
 #include <opencv2/imgproc/imgproc.hpp>

-#include "mynteye/glog_init.h"
+#include "mynteye/logger.h"

 #include "mynteye/device.h"
 #include "mynteye/utils.h"
--- a/samples/tutorials/control/auto_exposure.cc
+++ b/samples/tutorials/control/auto_exposure.cc
@@ -13,9 +13,8 @@
 // limitations under the License.
 #include <opencv2/highgui/highgui.hpp>

-#include <glog/logging.h>
-
 #include "mynteye/api.h"
+#include "mynteye/logger.h"

 #include "util/cv_painter.h"

--- a/samples/tutorials/control/framerate.cc
+++ b/samples/tutorials/control/framerate.cc
@@ -13,11 +13,10 @@
 // limitations under the License.
 #include <opencv2/highgui/highgui.hpp>

-#include <glog/logging.h>
-
 #include <atomic>

 #include "mynteye/api.h"
+#include "mynteye/logger.h"
 #include "mynteye/times.h"

 MYNTEYE_USE_NAMESPACE
--- a/samples/tutorials/control/infrared.cc
+++ b/samples/tutorials/control/infrared.cc
@@ -13,9 +13,8 @@
 // limitations under the License.
 #include <opencv2/highgui/highgui.hpp>

-#include <glog/logging.h>
-
 #include "mynteye/api.h"
+#include "mynteye/logger.h"

 MYNTEYE_USE_NAMESPACE

--- a/samples/tutorials/control/manual_exposure.cc
+++ b/samples/tutorials/control/manual_exposure.cc
@@ -13,9 +13,8 @@
 // limitations under the License.
 #include <opencv2/highgui/highgui.hpp>

-#include <glog/logging.h>
-
 #include "mynteye/api.h"
+#include "mynteye/logger.h"

 #include "util/cv_painter.h"

--- a/samples/tutorials/data/get_depth.cc
+++ b/samples/tutorials/data/get_depth.cc
@@ -13,9 +13,8 @@
 // limitations under the License.
 #include <opencv2/highgui/highgui.hpp>

-#include <glog/logging.h>
-
 #include "mynteye/api.h"
+#include "mynteye/logger.h"

 MYNTEYE_USE_NAMESPACE

--- a/samples/tutorials/data/get_device_info.cc
+++ b/samples/tutorials/data/get_device_info.cc
@@ -11,9 +11,8 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#include <glog/logging.h>
-
 #include "mynteye/api.h"
+#include "mynteye/logger.h"

 MYNTEYE_USE_NAMESPACE

--- a/samples/tutorials/data/get_disparity.cc
+++ b/samples/tutorials/data/get_disparity.cc
@@ -13,9 +13,9 @@
 // limitations under the License.
 #include <opencv2/highgui/highgui.hpp>

-#include <glog/logging.h>

 #include "mynteye/api.h"
+#include "mynteye/logger.h"

 MYNTEYE_USE_NAMESPACE

--- a/samples/tutorials/data/get_from_callbacks.cc
+++ b/samples/tutorials/data/get_from_callbacks.cc
@@ -13,14 +13,13 @@
 // limitations under the License.
 #include <opencv2/highgui/highgui.hpp>

-#include <glog/logging.h>
-
 #include <atomic>
 #include <memory>
 #include <mutex>
 #include <sstream>

 #include "mynteye/api.h"
+#include "mynteye/logger.h"

 #include "util/cv_painter.h"

--- a/samples/tutorials/data/get_img_params.cc
+++ b/samples/tutorials/data/get_img_params.cc
@@ -11,9 +11,8 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#include <glog/logging.h>
-
 #include "mynteye/api.h"
+#include "mynteye/logger.h"

 MYNTEYE_USE_NAMESPACE

--- a/samples/tutorials/data/get_imu.cc
+++ b/samples/tutorials/data/get_imu.cc
@@ -13,9 +13,8 @@
 // limitations under the License.
 #include <opencv2/highgui/highgui.hpp>

-#include <glog/logging.h>
-
 #include "mynteye/api.h"
+#include "mynteye/logger.h"

 #include "util/cv_painter.h"

--- a/samples/tutorials/data/get_imu_params.cc
+++ b/samples/tutorials/data/get_imu_params.cc
@@ -11,9 +11,8 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#include <glog/logging.h>
-
 #include "mynteye/api.h"
+#include "mynteye/logger.h"

 MYNTEYE_USE_NAMESPACE

--- a/samples/tutorials/data/get_points.cc
+++ b/samples/tutorials/data/get_points.cc
@@ -13,9 +13,8 @@
 // limitations under the License.
 #include <opencv2/highgui/highgui.hpp>

-#include <glog/logging.h>
-
 #include "mynteye/api.h"
+#include "mynteye/logger.h"

 #include "util/pc_viewer.h"

--- a/samples/tutorials/data/get_stereo.cc
+++ b/samples/tutorials/data/get_stereo.cc
@@ -13,9 +13,8 @@
 // limitations under the License.
 #include <opencv2/highgui/highgui.hpp>

-#include <glog/logging.h>
-
 #include "mynteye/api.h"
+#include "mynteye/logger.h"

 MYNTEYE_USE_NAMESPACE

--- a/samples/tutorials/data/get_stereo_rectified.cc
+++ b/samples/tutorials/data/get_stereo_rectified.cc
@@ -13,9 +13,8 @@
 // limitations under the License.
 #include <opencv2/highgui/highgui.hpp>

-#include <glog/logging.h>
-
 #include "mynteye/api.h"
+#include "mynteye/logger.h"

 MYNTEYE_USE_NAMESPACE

--- a/samples/tutorials/data/get_with_plugin.cc
+++ b/samples/tutorials/data/get_with_plugin.cc
@@ -13,9 +13,8 @@
 // limitations under the License.
 #include <opencv2/highgui/highgui.hpp>

-#include <glog/logging.h>
-
 #include "mynteye/api.h"
+#include "mynteye/logger.h"

 MYNTEYE_USE_NAMESPACE

--- a/samples/tutorials/intermediate/get_all_device_info.cc
+++ b/samples/tutorials/intermediate/get_all_device_info.cc
@@ -13,7 +13,7 @@
 // limitations under the License.
 #include "mynteye/context.h"
 #include "mynteye/device.h"
-#include "mynteye/glog_init.h"
+#include "mynteye/logger.h"

 MYNTEYE_USE_NAMESPACE

--- a/samples/tutorials/intermediate/get_depth_and_points.cc
+++ b/samples/tutorials/intermediate/get_depth_and_points.cc
@@ -14,7 +14,6 @@
 #include <opencv2/highgui/highgui.hpp>
 #include <opencv2/imgproc/imgproc.hpp>

-#include <glog/logging.h>

 #include "mynteye/api.h"

--- a/samples/tutorials/util/cv_painter.cc
+++ b/samples/tutorials/util/cv_painter.cc
@@ -13,8 +13,6 @@
 // limitations under the License.
 #include "util/cv_painter.h"

-#include <glog/logging.h>
-
 #include <opencv2/imgproc/imgproc.hpp>

 #include <iomanip>
@@ -22,6 +20,7 @@
 #include <memory>
 #include <utility>

+#include "mynteye/logger.h"
 #include "mynteye/utils.h"

 #define FONT_FACE cv::FONT_HERSHEY_PLAIN
--- a/samples/tutorials/util/pc_viewer.cc
+++ b/samples/tutorials/util/pc_viewer.cc
@@ -13,12 +13,12 @@
 // limitations under the License.
 #include "util/pc_viewer.h"

-#include <glog/logging.h>
-
 // #include <pcl/common/common_headers.h>

 #include <cmath>

+#include "mynteye/logger.h"
+
 std::shared_ptr<pcl::visualization::PCLVisualizer> CustomColorVis(
    pcl::PointCloud<pcl::PointXYZ>::ConstPtr pc) {
  // --------------------------------------------
--- a/samples/uvc/camera.cc
+++ b/samples/uvc/camera.cc
@@ -20,7 +20,7 @@
 #include <iostream>
 #include <mutex>

-#include "mynteye/glog_init.h"
+#include "mynteye/logger.h"
 #include "mynteye/mynteye.h"
 #include "mynteye/types.h"
 #include "uvc/uvc.h"