Make build independent from engshare (#24)

* Removed the dependency on engshare

* Fixed common/base dependency

* Fixed build on centos 7.5

* Fixed common/base dependency

* Fixed couple gcc-8.1 warnings

CMakeLists.txt

+# Copyright (c) 2019 - present, VE Software Inc. All rights reserved
+#
+# This source code is licensed under Apache 2.0 License
+# (found in the LICENSE.Apache file in the root directory)
+#
+# The build can be controlled by defining following variables on the
+# <cmake> command line
+#
+#   CMAKE_C_COMPILER        -- Specify the compiler for C language
+#   CMAKE_CXX_COMPILER      -- Specify the compiler for C++ language
+#   FLEX_EXECUTABLE         -- Specify the full path of flex executable
+#   VGRAPH_GPERF_BIN_DIR    -- Specify the full path to the directory
+#                              containing gperf binary
+#
+#   VGRAPH_KRB5_ROOT        -- Specify the root directory for KRB5
+#   VGRAPH_LIBUNWIND_ROOT   -- Specify the root directory for libunwind
+#   VGRAPH_OPENSSL_ROOT     -- Specify the root directory for openssl
+#   VGRAPH_BOOST_ROOT       -- Specify the root directory for boost
+#
 cmake_minimum_required(VERSION 3.0.0)
 
-project("vGraph" CXX)
+project("vGraph" C CXX)
 
 set(CMAKE_SKIP_RPATH TRUE)
 
@@ -31,10 +50,48 @@ set(VGRAPH_HOME ${CMAKE_CURRENT_SOURCE_DIR})
 # To include customized FindXXX.cmake modules
 set(CMAKE_MODULE_PATH "${VGRAPH_HOME}/cmake" ${CMAKE_MODULE_PATH})
 
-find_package(Boost)
-find_package(OpenSSL)
+if(NOT ${VGRAPH_KRB5_ROOT} STREQUAL "")
+    message(STATUS "Specified VGRAPH_KRB5_ROOT: " ${VGRAPH_KRB5_ROOT})
+    list(APPEND CMAKE_INCLUDE_PATH ${VGRAPH_KRB5_ROOT}/include)
+    list(APPEND CMAKE_LIBRARY_PATH ${VGRAPH_KRB5_ROOT}/lib)
+    list(APPEND CMAKE_PROGRAM_PATH ${VGRAPH_KRB5_ROOT}/bin)
+endif()
+
+if(NOT ${VGRAPH_LIBUNWIND_ROOT} STREQUAL "")
+    message(STATUS "Specified VGRAPH_LIBUNWIND_ROOT: " ${VGRAPH_LIBUNWIND_ROOT})
+    list(APPEND CMAKE_INCLUDE_PATH ${VGRAPH_LIBUNWIND_ROOT}/include)
+    list(APPEND CMAKE_LIBRARY_PATH ${VGRAPH_LIBUNWIND_ROOT}/lib)
+endif()
+
+if(NOT ${VGRAPH_OPENSSL_ROOT} STREQUAL "")
+    message(STATUS "Specified VGRAPH_OPENSSL_ROOT: " ${VGRAPH_OPENSSL_ROOT})
+    list(APPEND CMAKE_INCLUDE_PATH ${VGRAPH_OPENSSL_ROOT}/include)
+    list(APPEND CMAKE_LIBRARY_PATH ${VGRAPH_OPENSSL_ROOT}/lib)
+endif()
+
+if(NOT ${VGRAPH_BOOST_ROOT} STREQUAL "")
+    message(STATUS "Specified VGRAPH_BOOST_ROOT: " ${VGRAPH_BOOST_ROOT})
+    list(APPEND CMAKE_INCLUDE_PATH ${VGRAPH_BOOST_ROOT}/include)
+    list(APPEND CMAKE_LIBRARY_PATH ${VGRAPH_BOOST_ROOT}/lib)
+endif()
+
+if(NOT ${VGRAPH_GPERF_BIN_DIR} STREQUAL "")
+    message(STATUS "Specified VGRAPH_GPERF_BIN_DIR: " ${VGRAPH_GPERF_BIN_DIR})
+    list(APPEND CMAKE_PROGRAM_PATH ${VGRAPH_GPERF_BIN_DIR})
+endif()
+
+message(STATUS "CMAKE_INCLUDE_PATH: " ${CMAKE_INCLUDE_PATH})
+message(STATUS "CMAKE_LIBRARY_PATH: " ${CMAKE_LIBRARY_PATH})
+message(STATUS "CMAKE_PROGRAM_PATH: " ${CMAKE_PROGRAM_PATH})
+
+find_package(Boost REQUIRED)
+find_package(OpenSSL REQUIRED)
 find_package(Krb5 REQUIRED gssapi)
 find_package(PCHSupport)
+find_package(GPERF 2.8 REQUIRED)
+find_package(Libunwind REQUIRED)
+find_package(BISON REQUIRED)
+find_package(FLEX REQUIRED)
 
 add_compile_options(-Winvalid-pch)
 add_compile_options(-Wall)
@@ -92,7 +149,6 @@ set(THRIFT_LIBRARIES
     thriftcpp2
     thrift
     thriftprotocol
-    server
     async
     protocol
     transport

src/parser/CMakeLists.txt

 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
-find_package(BISON)
-find_package(FLEX)
 bison_target(Parser parser.yy ${CMAKE_CURRENT_BINARY_DIR}/VGraphParser.cpp COMPILE_FLAGS "-Werror")
 flex_target(Scanner scanner.lex ${CMAKE_CURRENT_BINARY_DIR}/VGraphScanner.cpp)
 

src/parser/Clauses.h

@@ -6,6 +6,7 @@
 #ifndef PARSER_CLAUSES_H_
 #define PARSER_CLAUSES_H_
 
+#include "base/Base.h"
 #include "parser/Expressions.h"
 
 namespace vesoft {

src/parser/Expressions.h

@@ -6,6 +6,7 @@
 #ifndef PARSER_EXPRESSIONS_H_
 #define PARSER_EXPRESSIONS_H_
 
+#include "base/Base.h"
 #include <boost/variant.hpp>
 
 namespace vesoft {

src/parser/GQLParser.h

@@ -6,8 +6,7 @@
 #ifndef PARSER_GQLPARSER_H_
 #define PARSER_GQLPARSER_H_
 
-#include <sstream>
-#include <regex>
+#include "base/Base.h"
 #include "VGraphParser.hpp"
 #include "VGraphScanner.h"
 

src/parser/MaintainSentences.h

@@ -6,6 +6,7 @@
 #ifndef PARSER_MAINTAINSENTENCES_H_
 #define PARSER_MAINTAINSENTENCES_H_
 
+#include "base/Base.h"
 #include "parser/Clauses.h"
 #include "parser/Sentence.h"
 

src/parser/MutateSentences.h

@@ -6,6 +6,7 @@
 #ifndef PARSER_MUTATESENTENCES_H_
 #define PARSER_MUTATESENTENCES_H_
 
+#include "base/Base.h"
 #include "parser/Clauses.h"
 #include "parser/Sentence.h"
 

src/parser/Sentence.h

@@ -6,6 +6,7 @@
 #ifndef PARSER_SENTENCE_H_
 #define PARSER_SENTENCE_H_
 
+#include "base/Base.h"
 #include "parser/Expressions.h"
 
 namespace vesoft {

src/parser/Statement.h

@@ -6,6 +6,7 @@
 #ifndef PARSER_STATEMENT_H_
 #define PARSER_STATEMENT_H_
 
+#include "base/Base.h"
 #include "parser/MaintainSentences.h"
 #include "parser/TraverseSentences.h"
 #include "parser/MutateSentences.h"

src/parser/TraverseSentences.h

@@ -6,6 +6,7 @@
 #ifndef PARSER_TRAVERSESENTENCES_H_
 #define PARSER_TRAVERSESENTENCES_H_
 
+#include "base/Base.h"
 #include "parser/Sentence.h"
 #include "parser/Clauses.h"
 

src/parser/VGraphScanner.h

@@ -6,6 +6,8 @@
 #ifndef PARSER_VGRAPHSCANNER_H_
 #define PARSER_VGRAPHSCANNER_H_
 
+#include "base/Base.h"
+
 // Only include FlexLexer.h if it hasn't been already included
 #if !defined(yyFlexLexerOnce)
 #include <FlexLexer.h>