From 6458c8df5194f92909ad5b76e6c267c780acb55f Mon Sep 17 00:00:00 2001
From: fengqikai1414 <fengqikai1414@126.com>
Date: Mon, 10 Sep 2018 17:54:58 -0700
Subject: [PATCH] cybertron: add gflags init support in mainboard

---
 framework/BUILD                              | 3 ++-
 framework/CMakeLists.txt                     | 4 +++-
 framework/cybertron/conf/cybertron.pb.conf   | 2 +-
 framework/cybertron/mainboard/CMakeLists.txt | 2 --
 framework/cybertron/mainboard/mainboard.cpp  | 2 ++
 5 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/framework/BUILD b/framework/BUILD
index 61f3f2d6aa..fdd54a6c6a 100644
--- a/framework/BUILD
+++ b/framework/BUILD
@@ -19,7 +19,8 @@ cc_library(
     ],
     deps = [
         ":cybertron_common",
-        "@glog//:glog"
+        "@glog//:glog",
+        "//external:gflags",
     ]
 )
 
diff --git a/framework/CMakeLists.txt b/framework/CMakeLists.txt
index 9475661d02..4e52a207c3 100644
--- a/framework/CMakeLists.txt
+++ b/framework/CMakeLists.txt
@@ -50,7 +50,8 @@ file(GLOB CYBERTRON_SRCS
   "cybertron/croutine/context/*.cpp"
   "cybertron/event/*.cpp"
   "cybertron/croutine/system/system_hook.cpp"
-  "cybertron/mainboard/*.cpp"
+  "cybertron/mainboard/module_argument.cpp"
+  "cybertron/mainboard/module_controller.cpp"
   "cybertron/message/*.cpp"
 )
 
@@ -72,6 +73,7 @@ target_link_libraries(cybertron
   fastcdr
   -lrt
   glog
+  gflags
   PocoFoundation
   -Wl,--no-undefined
   atomic
diff --git a/framework/cybertron/conf/cybertron.pb.conf b/framework/cybertron/conf/cybertron.pb.conf
index ac2d6b4dec..344d38af7c 100644
--- a/framework/cybertron/conf/cybertron.pb.conf
+++ b/framework/cybertron/conf/cybertron.pb.conf
@@ -1,5 +1,5 @@
 log_conf {
-    log_dir: "log"
+    log_dir: "/apollo/data/log"
     log_to_stderr: true
     # DEBUG INFO WARNING ERROR FATAL
     min_log_level: INFO
diff --git a/framework/cybertron/mainboard/CMakeLists.txt b/framework/cybertron/mainboard/CMakeLists.txt
index 1128e6c2db..36d7360305 100644
--- a/framework/cybertron/mainboard/CMakeLists.txt
+++ b/framework/cybertron/mainboard/CMakeLists.txt
@@ -2,8 +2,6 @@ project(mainboard)
 
 add_executable(mainboard
   mainboard.cpp
-  module_argument.cpp
-  module_controller.cpp
 )
 
 target_link_libraries(mainboard -pthread cybertron)
diff --git a/framework/cybertron/mainboard/mainboard.cpp b/framework/cybertron/mainboard/mainboard.cpp
index 948061c499..f91686c012 100644
--- a/framework/cybertron/mainboard/mainboard.cpp
+++ b/framework/cybertron/mainboard/mainboard.cpp
@@ -21,6 +21,7 @@
 #include "cybertron/init.h"
 #include "cybertron/mainboard/module_argument.h"
 #include "cybertron/mainboard/module_controller.h"
+#include "gflags/gflags.h"
 
 using apollo::cybertron::common::WorkRoot;
 using apollo::cybertron::common::GetAbsolutePath;
@@ -32,6 +33,7 @@ using apollo::cybertron::mainboard::ModuleController;
 int main(int argc, char** argv) {
   // Initialize cybertron internal static objects
   apollo::cybertron::Init(argv[0]);
+  google::SetUsageMessage("This program used for load dag and run user apps.");
 
   // parser the argument
   ModuleArgument module_args;
-- 
GitLab