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

Remove submodule glog

Browse Source
This commit is contained in:
John Zhao 2018-09-04 17:11:39 +08:00
parent d96797c835
commit 2784937ad1
4 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -1,9 +1,6 @@
[submodule "test/gtest"] [submodule "test/gtest"]
path = test/gtest path = test/gtest
url = https://github.com/google/googletest.git url = https://github.com/google/googletest.git
[submodule "third_party/glog"]
path = third_party/glog
url = https://github.com/google/glog.git
[submodule "tools/linter"] [submodule "tools/linter"]
path = tools/linter path = tools/linter
url = https://github.com/slightech/linter.git url = https://github.com/slightech/linter.git

10
Makefile
View File

@ -30,7 +30,6 @@ help:
@echo " make apidoc make api doc" @echo " make apidoc make api doc"
@echo " make opendoc open api doc (html)" @echo " make opendoc open api doc (html)"
@echo " make init init project" @echo " make init init project"
@echo " make 3rdparty build 3rdparty: glog"
@echo " make build build project" @echo " make build build project"
@echo " make install install project" @echo " make install install project"
@echo " make test build test and run" @echo " make test build test and run"
@ -71,14 +70,7 @@ cleandoc:
submodules: submodules:
@git submodule update --init @git submodule update --init
third_party: submodules .PHONY: submodules
@$(call echo,Make $@)
@$(call echo,Make glog,33)
@$(call cmake_build,./third_party/glog/_build)
3rdparty: third_party
.PHONY: submodules third_party 3rdparty
# init # init

3
cmake/Option.cmake
View File

@ -28,7 +28,8 @@ option(WITH_DEVICE_INFO_REQUIRED "Build with device info required" ON)
option(WITH_BOOST "Include Boost support" ON) option(WITH_BOOST "Include Boost support" ON)
# `make 3rdparty` could build glog submodule # How to install glog?
# Ubuntu: `sudo apt-get install libgoogle-glog-dev`
option(WITH_GLOG "Include glog support" OFF) option(WITH_GLOG "Include glog support" OFF)

1
third_party/glog vendored

@ -1 +0,0 @@
Subproject commit 8d7a107d68c127f3f494bb7807b796c8c5a97a82