Skip to content
This repository has been archived by the owner on Dec 1, 2022. It is now read-only.

Use compiled common to build storage #87

Merged
merged 2 commits into from
Jul 13, 2020
Merged

Use compiled common to build storage #87

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5515582
Use compiled common sources
yixinglu Jul 13, 2020
672cb72
Merge branch 'master' into use-compiled-common
dangleptr Jul 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
# NEBULA_OTHER_ROOT -- Specify the root directory for user build
# -- Split with ":", exp: DIR:DIR
#
# NEBULA_COMMON_PATH -- Path to nebula-common source directory
# NEBULA_COMMON_REPO_URL -- Git URL for the nebula-common repo
# NEBULA_COMMON_REPO_TAG -- Tag/branch of the nebula-common repo
#
Expand Down Expand Up @@ -145,7 +146,13 @@ endif()
message(STATUS "NEBULA_COMMON_REPO_TAG: " ${NEBULA_COMMON_REPO_TAG})

SET(NEBULA_COMMON_PACKAGE "nebula-common")
SET(nebula-common_DIR ${CMAKE_CURRENT_SOURCE_DIR}/modules/common)
if (NOT "${NEBULA_COMMON_PATH}" STREQUAL "")
message(STATUS "NEBULA_COMMON_PATH: " ${NEBULA_COMMON_PATH})
execute_process(
COMMAND mkdir -p ${NEBULA_HOME}/modules
COMMAND ln -snf ${NEBULA_COMMON_PATH} ${NEBULA_HOME}/modules/common
)
endif()

# Configure the dependent projects
include(AddDependentProject)
Expand Down