Skip to content

Commit

Permalink
remove leaf and use leaf from system wide
Browse files Browse the repository at this point in the history
  • Loading branch information
zhanglei1949 committed Sep 5, 2024
1 parent 99d8fd8 commit 127d875
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 13 deletions.
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,3 @@
path = flex/third_party/nlohmann-json
url = https://github.com/nlohmann/json.git

[submodule "flex/third_party/leaf"]
path = flex/third_party/leaf
url = https://github.com/boostorg/leaf.git
7 changes: 0 additions & 7 deletions flex/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -192,13 +192,6 @@ if (NOT EXISTS ${CMAKE_SOURCE_DIR}/third_party/nlohmann-json/single_include/nloh
endif()
include_directories(SYSTEM ${CMAKE_SOURCE_DIR}/third_party/nlohmann-json/single_include)

# Check whether ${CMAKE_SOURCE_DIR}/third_party/leaf/include/leaf.hpp exists
if (NOT EXISTS ${CMAKE_SOURCE_DIR}/third_party/leaf/include/boost/leaf.hpp)
message(FATAL_ERROR "${CMAKE_SOURCE_DIR}/third_party/leaf/include/boost/leaf.hpp not found, "
"please run `git submodule update --init` to download third_party")
endif()
include_directories(SYSTEM ${CMAKE_SOURCE_DIR}/third_party/leaf/include)

if (BUILD_ODPS_FRAGMENT_LOADER)
include_directories(SYSTEM ${CMAKE_SOURCE_DIR}/third_party/odps/include)
endif()
Expand Down
1 change: 1 addition & 0 deletions flex/engines/graph_db/runtime/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ install_flex_target(runtime_common)
file(GLOB_RECURSE ADHOC_SOURCES "adhoc/*.cc")
add_library(runtime_adhoc SHARED ${ADHOC_SOURCES})
target_link_libraries(runtime_adhoc runtime_common)
target_link_libraries(runtime_adhoc Boost::headers)
install_flex_target(runtime_adhoc)


4 changes: 2 additions & 2 deletions flex/engines/graph_db/runtime/common/leaf_utils.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#ifndef RUNTIME_COMMON_LEAF_UTILS_H_
#define RUNTIME_COMMON_LEAF_UTILS_H_

#include "boost/leaf.hpp"
#include <boost/leaf.hpp>
#include "flex/utils/result.h"

namespace bl = boost::leaf;
Expand All @@ -33,4 +33,4 @@ namespace bl = boost::leaf;
return ::boost::leaf::new_error( \
::gs::Status(::gs::StatusCode::UNIMPLEMENTED, msg))

#endif // RUNTIME_COMMON_LEAF_UTILS_H_
#endif // RUNTIME_COMMON_LEAF_UTILS_H_
1 change: 0 additions & 1 deletion flex/third_party/leaf
Submodule leaf deleted from 907bd6

0 comments on commit 127d875

Please sign in to comment.