tami/MYNT-EYE-S-SDK
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move glog_init.h

Browse Source
This commit is contained in:
John Zhao 2018-04-09 09:28:58 +08:00
parent 71c21d789a
commit d40c48df3a
5 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -70,6 +70,7 @@ set(MYNTEYE_NAME ${PROJECT_NAME})
set(MYNTEYE_PUBLIC_H set(MYNTEYE_PUBLIC_H
${CMAKE_CURRENT_SOURCE_DIR}/include/mynteye/global.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_BINARY_DIR}/include/mynteye/mynteye.h
${CMAKE_CURRENT_SOURCE_DIR}/include/mynteye/types.h ${CMAKE_CURRENT_SOURCE_DIR}/include/mynteye/types.h
) )

0
samples/glog_init.h → include/mynteye/glog_init.h
View File

4
samples/CMakeLists.txt
View File

@ -40,10 +40,6 @@ include(${PRO_DIR}/cmake/Common.cmake)
set(OUT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/_output") set(OUT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/_output")
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
)
# samples above device layer # samples above device layer
add_subdirectory(device) add_subdirectory(device)

2
samples/device/camera.cc
View File

@ -1,7 +1,7 @@
#include <opencv2/highgui/highgui.hpp> #include <opencv2/highgui/highgui.hpp>
#include <opencv2/imgproc/imgproc.hpp> #include <opencv2/imgproc/imgproc.hpp>
#include "glog_init.h" // NOLINT #include "mynteye/glog_init.h"
#include "device/context.h" #include "device/context.h"
#include "device/device.h" #include "device/device.h"

3
samples/uvc/camera.cc
View File

@ -7,12 +7,11 @@
#include <iostream> #include <iostream>
#include <mutex> #include <mutex>
#include "mynteye/glog_init.h"
#include "mynteye/mynteye.h" #include "mynteye/mynteye.h"
#include "mynteye/types.h" #include "mynteye/types.h"
#include "uvc/uvc.h" #include "uvc/uvc.h"
#include "glog_init.h" // NOLINT
struct frame { struct frame {
const void *data = nullptr; const void *data = nullptr;
~frame() { ~frame() {