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

Merge branch 'develop' of http://gitlab.mynt.com/mynteye/mynt-eye-sdk-2 into develop

Browse Source
This commit is contained in:
kalman 2019-01-16 21:02:46 +08:00
commit b898184fe4
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -27,7 +27,7 @@ MKFILE_DIR := $(patsubst %/,%,$(dir $(MKFILE_PATH)))
# SUDO: sudo command # SUDO: sudo command
# CAM_MODELS: cmake build with -DWITH_CAM_MODELS=ON # CAM_MODELS: cmake build with -DWITH_CAM_MODELS=ON
# #
# e.g. make [TARGET] SUOD= # e.g. make [TARGET] SUDO=
# e.g. make [TARGET] CAM_MODELS=1 # e.g. make [TARGET] CAM_MODELS=1
SUDO ?= sudo SUDO ?= sudo
@ -35,7 +35,9 @@ SUDO ?= sudo
CAM_MODELS ?= CAM_MODELS ?=
CMAKE_BUILD_EXTRA_OPTIONS := CMAKE_BUILD_EXTRA_OPTIONS :=
ifneq ($(CAM_MODELS),) ifeq ($(CAM_MODELS),)
CMAKE_BUILD_EXTRA_OPTIONS := $(CMAKE_BUILD_EXTRA_OPTIONS) -DWITH_CAM_MODELS=OFF
else
CMAKE_BUILD_EXTRA_OPTIONS := $(CMAKE_BUILD_EXTRA_OPTIONS) -DWITH_CAM_MODELS=ON CMAKE_BUILD_EXTRA_OPTIONS := $(CMAKE_BUILD_EXTRA_OPTIONS) -DWITH_CAM_MODELS=ON
endif endif

2
cmake/Option.cmake
View File

@ -44,7 +44,7 @@ else()
endif() endif()
if(WITH_BOOST) if(WITH_BOOST)
find_package(Boost COMPONENTS filesystem) find_package(Boost QUIET COMPONENTS filesystem)
if(Boost_FOUND) if(Boost_FOUND)
set(Boost_VERSION_STRING "${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION}") set(Boost_VERSION_STRING "${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION}")
set(WITH_FILESYSTEM TRUE) set(WITH_FILESYSTEM TRUE)