fixing cmake problem

alibaba · Jun 7, 2024 · eb53059 · eb53059
1 parent 6c8cfd1
commit eb53059
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/flex/CMakeLists.txt b/flex/CMakeLists.txt
@@ -121,12 +121,20 @@ find_package(Boost REQUIRED COMPONENTS system filesystem
              context program_options regex thread date_time)
 add_definitions("-DBOOST_BIND_GLOBAL_PLACEHOLDERS")
 
+#find hiactor----------------------------------------------------------------------
+find_package(Hiactor)
+if (NOT Hiactor_FOUND)
+    message(STATUS "hiactor not found, please install the hiactor library")
+else ()
+    include_directories(SYSTEM ${Hiactor_INCLUDE_DIRS})
+endif()
+
 #find arrow----------------------------------------------------------------------
 find_package(Arrow REQUIRED)
 if (NOT Arrow_FOUND)
     message(FATAL_ERROR "arrow not found, please install the arrow library")
 else ()
-    include_directories(SYSTEM ${ARROW_INCLUDE_DIRS})
+    include_directories(SYSTEM ${ARROW_INCLUDE_DIR})
     if (TARGET arrow_shared)
         set(ARROW_SHARED_LIB arrow_shared)
     endif()

diff --git a/flex/bin/CMakeLists.txt b/flex/bin/CMakeLists.txt
@@ -1,5 +1,3 @@
-find_package(Hiactor)
-
 if(Hiactor_FOUND)
         add_executable(rt_server rt_server.cc)
         target_link_libraries(rt_server flex_utils flex_rt_mutable_graph flex_graph_db flex_server)

diff --git a/flex/engines/graph_db/grin/CMakeLists.txt b/flex/engines/graph_db/grin/CMakeLists.txt
@@ -34,11 +34,11 @@ if (GLOG_FOUND)
 endif ()
 
 #find arrow----------------------------------------------------------------------
-include("../../../../flex/cmake/FindArrow.cmake")
+find_package(Arrow REQUIRED)
 if (NOT ARROW_FOUND)
     message(FATAL_ERROR "arrow not found, please install the arrow library")
 else ()
-    include_directories(SYSTEM ${ARROW_INCLUDE_DIRS})
+    include_directories(SYSTEM ${ARROW_INCLUDE_DIR})
     if (TARGET arrow_shared)
         set(ARROW_SHARED_LIB arrow_shared)
     endif()