Skip to content
Permalink
Browse files

Set default third-party install path and modify how-to-build.md (#673)

* Add default value for third-party

* Modify how-to-build.md

* Address Amber1990Zhang's comments
  • Loading branch information...
laura-ding authored and dutor committed Jul 24, 2019
1 parent 560d60b commit 701741028f10e7f299132c7d21fbd0d8be5b44eb
Showing with 9 additions and 7 deletions.
  1. +6 −5 CMakeLists.txt
  2. +3 −2 docs/how-to-build.md
@@ -171,6 +171,11 @@ if(NOT ${NEBULA_GPERF_BIN_DIR} STREQUAL "")
list(INSERT CMAKE_PROGRAM_PATH 0 ${NEBULA_GPERF_BIN_DIR})
endif()

# When NEBULA_THIRDPARTY_ROOT is null, set default value as /opt/nebula/third-party
if("${NEBULA_THIRDPARTY_ROOT}" STREQUAL "")
SET(NEBULA_THIRDPARTY_ROOT "/opt/nebula/third-party")
endif()

# third-party
if(NOT ${NEBULA_THIRDPARTY_ROOT} STREQUAL "")
message(STATUS "Specified NEBULA_THIRDPARTY_ROOT: " ${NEBULA_THIRDPARTY_ROOT})
@@ -250,10 +255,6 @@ if(NOT ${NEBULA_THIRDPARTY_ROOT} STREQUAL "")

endif()

option(asan "Whether to turn AddressSanitizer ON or OFF" OFF)

message(STATUS "ASAN: ${asan}")

string(REPLACE ";" ":" INCLUDE_PATH_STR "${CMAKE_INCLUDE_PATH}")
string(REPLACE ";" ":" LIBRARY_PATH_STR "${CMAKE_LIBRARY_PATH}")
string(REPLACE ";" ":" PROGRAM_PATH_STR "${CMAKE_PROGRAM_PATH}")
@@ -492,7 +493,7 @@ endmacro(nebula_link_libraries)

if (NOT SKIP_JAVA_CLIENT)
if (NOT EXISTS "${NEBULA_THIRDPARTY_ROOT}/fbthrift/thrift-1.0-SNAPSHOT.jar")
message(FATAL_ERROR "Have not thrift-1.0-SNAPSHOT.jar")
message(FATAL_ERROR "Doesn't have thrift-1.0-SNAPSHOT.jar")
endif()
set(java-fbthrift-jar ${NEBULA_THIRDPARTY_ROOT}/fbthrift/thrift-1.0-SNAPSHOT.jar)
set(NEBULA_CLEAN_ALL_DEPS clean-interface clean-pch clean-hbase clean-java-client)
@@ -40,11 +40,12 @@ The project itself includes the source code of several 3rd-party libraries, whic
- zstd

### How to get 3rd-party Libraries
[Install guide](https://github.com/vesoft-inc/nebula-3rdparty/blob/master/README.md)


### How to build
- 1. create build dir : `cd nebula && mkdir build && cd build`
- 2. generate makefile : `cmake ..`
- 2. generate makefile : `cmake -DNEBULA_THIRDPARTY_ROOT=${3rd-party_install_root} ..`
- 3. make : `make or make -j${threadnum}`
- 4. install: `make install`
- notes : the default install dir is **/usr/local/**, if you want to change the dir, on step 2, your command can be `cmake -DCMAKE_INSTALL_PREFIX=$your_nebula_install_dir ..`
- notes : the default installation dir is **/usr/local/**, if you want to change the dir, on step 2, your command can be `cmake -DCMAKE_INSTALL_PREFIX=$your_nebula_install_dir ..`

0 comments on commit 7017410

Please sign in to comment.
You can’t perform that action at this time.