This is an automated email from the ASF dual-hosted git repository.
huor pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hawq.git
The following commit(s) were added to refs/heads/master by this push:
new 0f6ed94 HAWQ-1700. fix hawq cannot be build in linux bug
0f6ed94 is described below
commit 0f6ed94dfb09d7263f809abed3b0a70d3b8db82e
Author: oushu1tuyu1 <[email protected]>
AuthorDate: Mon Apr 15 17:41:01 2019 +0800
HAWQ-1700. fix hawq cannot be build in linux bug
---
depends/storage/src/CMakeLists.txt | 3 +++
depends/univplan/src/CMakeLists.txt | 1 +
2 files changed, 4 insertions(+)
diff --git a/depends/storage/src/CMakeLists.txt
b/depends/storage/src/CMakeLists.txt
index dd6f1ac..f4fd163 100644
--- a/depends/storage/src/CMakeLists.txt
+++ b/depends/storage/src/CMakeLists.txt
@@ -15,6 +15,7 @@ set(CMAKE_MACOSX_RPATH 1)
SET(storage_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR})
SET(storage_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/storage)
SET(orcformat_proto_DIR ${storage_SRC_DIR}/format/orc)
+SET(Protobuf_PROTOC_EXECUTABLE /usr/local/bin/protoc)
file(GLOB proto_files "${storage_SRC_DIR}/format/orc/*.proto")
set(proto_SRC_DIR ${CMAKE_BINARY_DIR}/src/storage/format/orc)
@@ -47,11 +48,13 @@ INCLUDE_DIRECTORIES(${DEPENDENCY_INSTALL_PREFIX}/include)
INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/src)
INCLUDE_DIRECTORIES(/usr/local/include)
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../univplan/build/install/usr/local/hawq/include)
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../dbcommon/build/install/usr/local/hawq/include)
LINK_DIRECTORIES(/usr/local/lib)
#LINK_DIRECTORIES(${DEPENDENCY_INSTALL_PREFIX}/package/lib)
LINK_DIRECTORIES(${DEPENDENCY_INSTALL_PREFIX}/lib)
LINK_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../libhdfs3/build/install/usr/local/hawq/lib)
LINK_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../univplan/build/install/usr/local/hawq/lib)
+LINK_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../dbcommon/build/install/usr/local/hawq/lib)
ADD_LIBRARY(storage-shared SHARED ${storage_SOURCES} ${storage_PROTO_SRCS}
${storage_PROTO_HDRS})
diff --git a/depends/univplan/src/CMakeLists.txt
b/depends/univplan/src/CMakeLists.txt
index 950c8d5..2b85167 100644
--- a/depends/univplan/src/CMakeLists.txt
+++ b/depends/univplan/src/CMakeLists.txt
@@ -12,6 +12,7 @@ set(CMAKE_MACOSX_RPATH 1)
SET(univplan_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR})
SET(univplan_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/univplan)
SET(univplan_proto_DIR ${univplan_SRC_DIR}/proto)
+SET(Protobuf_PROTOC_EXECUTABLE /usr/local/bin/protoc)
file(GLOB proto_files "${univplan_SRC_DIR}/proto/*.proto")
set(proto_SRC_DIR ${CMAKE_BINARY_DIR}/src/univplan/proto)
