Skip to content
Snippets Groups Projects
Commit 0217ef74 authored by laura-ding's avatar laura-ding Committed by dangleptr
Browse files

Fix link dynamic library (#1121)

* Fix link dynamic library

* Add -DENABLE_TESTING=OFF into package.sh
parent 769f40cc
No related branches found
No related tags found
No related merge requests found
......@@ -128,10 +128,10 @@ endif()
# third-party
if(NOT ${NEBULA_THIRDPARTY_ROOT} STREQUAL "")
message(STATUS "Specified NEBULA_THIRDPARTY_ROOT: " ${NEBULA_THIRDPARTY_ROOT})
list(APPEND CMAKE_INCLUDE_PATH ${NEBULA_THIRDPARTY_ROOT}/include)
list(APPEND CMAKE_LIBRARY_PATH ${NEBULA_THIRDPARTY_ROOT}/lib)
list(APPEND CMAKE_LIBRARY_PATH ${NEBULA_THIRDPARTY_ROOT}/lib64)
list(APPEND CMAKE_PROGRAM_PATH ${NEBULA_THIRDPARTY_ROOT}/bin)
list(INSERT CMAKE_INCLUDE_PATH 0 ${NEBULA_THIRDPARTY_ROOT}/include)
list(INSERT CMAKE_LIBRARY_PATH 0 ${NEBULA_THIRDPARTY_ROOT}/lib)
list(INSERT CMAKE_LIBRARY_PATH 0 ${NEBULA_THIRDPARTY_ROOT}/lib64)
list(INSERT CMAKE_PROGRAM_PATH 0 ${NEBULA_THIRDPARTY_ROOT}/bin)
include_directories(SYSTEM ${NEBULA_THIRDPARTY_ROOT}/include)
link_directories(
${NEBULA_THIRDPARTY_ROOT}/lib
......@@ -148,6 +148,7 @@ if(NOT ${NEBULA_OTHER_ROOT} STREQUAL "")
list(INSERT CMAKE_PROGRAM_PATH 0 ${DIR}/bin)
include_directories(SYSTEM ${DIR}/include)
link_directories(${DIR}/lib)
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -L ${DIR}/lib")
endforeach()
endif()
......@@ -316,6 +317,9 @@ include_directories(AFTER ${CMAKE_CURRENT_BINARY_DIR}/src/kvstore/plugins)
include_directories(AFTER ${CMAKE_CURRENT_BINARY_DIR}/src/kvstore/plugins/hbase)
include_directories(AFTER ${CMAKE_CURRENT_BINARY_DIR}/src/parser)
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -L ${NEBULA_THIRDPARTY_ROOT}/lib")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -L ${NEBULA_THIRDPARTY_ROOT}/lib64")
# All thrift libraries
set(THRIFT_LIBRARIES
thriftcpp2
......
......@@ -85,6 +85,9 @@ Group: Applications/Databases
%attr(0755,root,root) %{_datadir}/nebula.service
%attr(0755,root,root) %{_datadir}/utils.sh
%attr(0755,root,root) %{_datadir}/services.sh
%attr(0644,root,root) %{_datadir}/graph.hosts
%attr(0644,root,root) %{_datadir}/meta.hosts
%attr(0644,root,root) %{_datadir}/storage.hosts
# metad rpm include files
%files metad
......
......@@ -63,9 +63,9 @@ function build {
pushd ${build_dir}
cmake -DCMAKE_BUILD_TYPE=Release -DNEBULA_BUILD_VERSION=${version} -DCMAKE_INSTALL_PREFIX=/usr/local/nebula ..
cmake -DCMAKE_BUILD_TYPE=Release -DNEBULA_BUILD_VERSION=${version} -DCMAKE_INSTALL_PREFIX=/usr/local/nebula -DENABLE_TESTING=OFF ..
if !( make -j10 ); then
if !( make -j$(nproc) ); then
echo ">>> build nebula failed <<<"
exit -1
fi
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment