Skip to content

Commit 80dcbf6

Browse files
committed
fix cmake
1 parent 81e2649 commit 80dcbf6

File tree

3 files changed

+3
-11
lines changed

3 files changed

+3
-11
lines changed

flex/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ option(BUILD_DOC "Whether to build doc" OFF)
1515
option(BUILD_ODPS_FRAGMENT_LOADER "Whether to build odps fragment loader" OFF)
1616
option(USE_PTHASH "Whether to use pthash" OFF)
1717
option(OPTIMIZE_FOR_HOST "Whether to optimize on host" ON) # Whether to build optimized code on host
18-
option(USE_STATIC_ARROW "Whether to use static arrow" ON) # Whether to link arrow statically, default is ON
18+
option(USE_STATIC_ARROW "Whether to use static arrow" OFF) # Whether to link arrow statically, default is OFF
1919
option(BUILD_WITH_OTEL "Whether to build with opentelemetry-cpp" OFF) # Whether to build with opentelemetry-cpp, default is OFF
2020

2121
#print options

flex/engines/graph_db/runtime/common/operators/retrieve/edge_expand.cc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -795,7 +795,6 @@ Context EdgeExpand::expand_vertex_ep_gt(const GraphReadInterface& graph,
795795
}
796796
}
797797
SLVertexColumnBuilder builder(std::get<0>(label_dirs[0]));
798-
size_t csr_idx = 0;
799798
std::vector<size_t> offsets;
800799
for (auto& csr : views) {
801800
size_t idx = 0;
@@ -806,7 +805,6 @@ Context EdgeExpand::expand_vertex_ep_gt(const GraphReadInterface& graph,
806805
});
807806
++idx;
808807
}
809-
++csr_idx;
810808
}
811809
std::shared_ptr<IContextColumn> col = builder.finish();
812810
ctx.set_with_reshuffle(params.alias, col, offsets);

flex/utils/CMakeLists.txt

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ set(GIE_COMPILER_PROTO_DIR ${CMAKE_CURRENT_SOURCE_DIR}/proto/)
2424
set(GIE_COMPILER_PROTO_JOB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../interactive_engine/executor/engine/pegasus/server/proto/)
2525
# proto files of gie compiler
2626
set(CODE_GEN_PROTOBUF_FILES
27-
${GIE_COMPILER_PROTO_DIR}/physical.proto
2827
${GIE_COMPILER_PROTO_DIR}/algebra.proto
2928
${GIE_COMPILER_PROTO_DIR}/common.proto
3029
${GIE_COMPILER_PROTO_DIR}/expr.proto
30+
${GIE_COMPILER_PROTO_DIR}/physical.proto
3131
${GIE_COMPILER_PROTO_DIR}/results.proto
3232
${GIE_COMPILER_PROTO_DIR}/schema.proto
3333
${GIE_COMPILER_PROTO_DIR}/type.proto
@@ -71,13 +71,7 @@ target_include_directories(flex_utils PUBLIC
7171
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
7272
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>)
7373
# Link the static library of arrow, to save the trouble of linking the shared library of arrow
74-
if (ARROW_SHARED_LIB)
75-
target_link_libraries(flex_utils PRIVATE ${ARROW_SHARED_LIB})
76-
else()
77-
target_link_libraries(flex_utils PRIVATE ${ARROW_STATIC_LIB})
78-
endif()
79-
80-
target_link_libraries(flex_utils PUBLIC ${YAML_CPP_LIBRARIES} ${Boost_LIBRARIES} ${GLOG_LIBRARIES} ${Protobuf_LIBRARIES})
74+
target_link_libraries(flex_utils PUBLIC ${Protobuf_LIBRARIES} ${ARROW_LIB} ${YAML_CPP_LIBRARIES} ${Boost_LIBRARIES} ${GLOG_LIBRARIES})
8175

8276

8377
#find_package(mimalloc 1.8 REQUIRED)

0 commit comments

Comments
 (0)