From d40c48df3aef466cb938264be8f2dc3e305b0b85 Mon Sep 17 00:00:00 2001 From: John Zhao Date: Mon, 9 Apr 2018 09:28:58 +0800 Subject: [PATCH] Move glog_init.h --- CMakeLists.txt | 1 + {samples => include/mynteye}/glog_init.h | 0 samples/CMakeLists.txt | 4 ---- samples/device/camera.cc | 2 +- samples/uvc/camera.cc | 3 +-- 5 files changed, 3 insertions(+), 7 deletions(-) rename {samples => include/mynteye}/glog_init.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8eb6253..43b3800 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -70,6 +70,7 @@ set(MYNTEYE_NAME ${PROJECT_NAME}) set(MYNTEYE_PUBLIC_H ${CMAKE_CURRENT_SOURCE_DIR}/include/mynteye/global.h + ${CMAKE_CURRENT_SOURCE_DIR}/include/mynteye/glog_init.h ${CMAKE_CURRENT_BINARY_DIR}/include/mynteye/mynteye.h ${CMAKE_CURRENT_SOURCE_DIR}/include/mynteye/types.h ) diff --git a/samples/glog_init.h b/include/mynteye/glog_init.h similarity index 100% rename from samples/glog_init.h rename to include/mynteye/glog_init.h diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt index 2c6de86..4093677 100644 --- a/samples/CMakeLists.txt +++ b/samples/CMakeLists.txt @@ -40,10 +40,6 @@ include(${PRO_DIR}/cmake/Common.cmake) set(OUT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/_output") -include_directories( - ${CMAKE_CURRENT_SOURCE_DIR} -) - # samples above device layer add_subdirectory(device) diff --git a/samples/device/camera.cc b/samples/device/camera.cc index c98e731..94c009e 100644 --- a/samples/device/camera.cc +++ b/samples/device/camera.cc @@ -1,7 +1,7 @@ #include #include -#include "glog_init.h" // NOLINT +#include "mynteye/glog_init.h" #include "device/context.h" #include "device/device.h" diff --git a/samples/uvc/camera.cc b/samples/uvc/camera.cc index 2bf8a0b..e0b1554 100644 --- a/samples/uvc/camera.cc +++ b/samples/uvc/camera.cc @@ -7,12 +7,11 @@ #include #include +#include "mynteye/glog_init.h" #include "mynteye/mynteye.h" #include "mynteye/types.h" #include "uvc/uvc.h" -#include "glog_init.h" // NOLINT - struct frame { const void *data = nullptr; ~frame() {