Skip to content

Commit

Permalink
fix package error when cmake version less than 3.13 (vesoft-inc#974)
Browse files Browse the repository at this point in the history
Co-authored-by: Yee <[email protected]>
  • Loading branch information
laura-ding and yixinglu authored Apr 22, 2021
1 parent 51f7e48 commit 3be72c2
Showing 1 changed file with 8 additions and 6 deletions.
14 changes: 8 additions & 6 deletions package/package.sh
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ function _build_storage {
git clone --single-branch --branch ${branch} https://github.com/vesoft-inc/nebula-storage.git ${storage_dir}
fi

pushd ${storage_build_dir}
cmake -DCMAKE_BUILD_TYPE=${build_type} \
-DNEBULA_BUILD_VERSION=${version} \
-DENABLE_ASAN=${san} \
Expand All @@ -98,17 +99,18 @@ function _build_storage {
-DNEBULA_COMMON_REPO_TAG=${branch} \
-DENABLE_TESTING=OFF \
-DENABLE_PACK_ONE=${package_one} \
-S ${storage_dir} \
-B ${storage_build_dir}
${storage_dir}

if ! ( cmake --build ${storage_build_dir} -j ${jobs} ); then
if ! ( make -j ${jobs} ); then
echo ">>> build nebula storage failed <<<"
exit 1
fi
popd
echo ">>> build nebula storage successfully <<<"
}

function _build_graph {
pushd ${build_dir}
cmake -DCMAKE_BUILD_TYPE=${build_type} \
-DNEBULA_BUILD_VERSION=${version} \
-DENABLE_ASAN=${san} \
Expand All @@ -120,13 +122,13 @@ function _build_graph {
-DENABLE_TESTING=OFF \
-DENABLE_BUILD_STORAGE=OFF \
-DENABLE_PACK_ONE=${package_one} \
-S ${project_dir} \
-B ${build_dir}
${project_dir}

if ! ( cmake --build ${build_dir} -j ${jobs} ); then
if ! ( make -j ${jobs} ); then
echo ">>> build nebula graph failed <<<"
exit 1
fi
popd
echo ">>> build nebula graph successfully <<<"
}

Expand Down

0 comments on commit 3be72c2

Please sign in to comment.