From 2784937ad16ac0fa54ca75801996df523d768cfa Mon Sep 17 00:00:00 2001 From: John Zhao Date: Tue, 4 Sep 2018 17:11:39 +0800 Subject: [PATCH] Remove submodule glog --- .gitmodules | 3 --- Makefile | 10 +--------- cmake/Option.cmake | 3 ++- third_party/glog | 1 - 4 files changed, 3 insertions(+), 14 deletions(-) delete mode 160000 third_party/glog diff --git a/.gitmodules b/.gitmodules index d40f165..3a8bfae 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,6 @@ [submodule "test/gtest"] path = test/gtest 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"] path = tools/linter url = https://github.com/slightech/linter.git diff --git a/Makefile b/Makefile index 5483d78..974617f 100644 --- a/Makefile +++ b/Makefile @@ -30,7 +30,6 @@ help: @echo " make apidoc make api doc" @echo " make opendoc open api doc (html)" @echo " make init init project" - @echo " make 3rdparty build 3rdparty: glog" @echo " make build build project" @echo " make install install project" @echo " make test build test and run" @@ -71,14 +70,7 @@ cleandoc: submodules: @git submodule update --init -third_party: submodules - @$(call echo,Make $@) - @$(call echo,Make glog,33) - @$(call cmake_build,./third_party/glog/_build) - -3rdparty: third_party - -.PHONY: submodules third_party 3rdparty +.PHONY: submodules # init diff --git a/cmake/Option.cmake b/cmake/Option.cmake index e50601a..98e9e49 100644 --- a/cmake/Option.cmake +++ b/cmake/Option.cmake @@ -28,7 +28,8 @@ option(WITH_DEVICE_INFO_REQUIRED "Build with device info required" 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) diff --git a/third_party/glog b/third_party/glog deleted file mode 160000 index 8d7a107..0000000 --- a/third_party/glog +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 8d7a107d68c127f3f494bb7807b796c8c5a97a82