Clean up dependency on proxygen libs (vesoft-inc#488)

* Clean up dependency on proxygen libs * Address comments
yixinglu · Jun 1, 2019 · 806528b · 806528b
1 parent 7bdcd1e
commit 806528b
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -277,8 +277,6 @@ macro(nebula_link_libraries target)
     target_link_libraries(
         ${target}
         ${ARGN}
-        proxygenhttpserver
-        proxygenlib
         folly
         glog
         gflags

diff --git a/src/daemons/CMakeLists.txt b/src/daemons/CMakeLists.txt
@@ -2,6 +2,7 @@ add_executable(
     nebula-graphd
     GraphDaemon.cpp
     $<TARGET_OBJECTS:meta_client>
+    $<TARGET_OBJECTS:graph_http_obj>
     $<TARGET_OBJECTS:meta_thrift_obj>
     $<TARGET_OBJECTS:graph_obj>
     $<TARGET_OBJECTS:base_obj>
@@ -38,6 +39,7 @@ add_executable(
     nebula-storaged
     StorageDaemon.cpp
     $<TARGET_OBJECTS:storage_service_handler>
+    $<TARGET_OBJECTS:storage_http_handler>
     $<TARGET_OBJECTS:storage_thrift_obj>
     $<TARGET_OBJECTS:kvstore_obj>
     $<TARGET_OBJECTS:meta_client>
@@ -69,6 +71,7 @@ add_executable(
     nebula-metad
     MetaDaemon.cpp
     $<TARGET_OBJECTS:meta_service_handler>
+    $<TARGET_OBJECTS:meta_http_handler>
     $<TARGET_OBJECTS:kvstore_obj>
     $<TARGET_OBJECTS:schema_obj>
     $<TARGET_OBJECTS:meta_client>

diff --git a/src/executor/CMakeLists.txt b/src/executor/CMakeLists.txt
@@ -2,7 +2,6 @@ add_library(
     graph_obj OBJECT
     GraphFlags.cpp
     GraphService.cpp
-    GraphHttpHandler.cpp
     ClientSession.cpp
     SessionManager.cpp
     ExecutionEngine.cpp
@@ -40,12 +39,15 @@ add_dependencies(
     base_obj
     parser_obj
     graph_thrift_obj
-    ws_obj
     meta_thrift_obj
     meta_client
     schema_obj
     stats_obj
 )
 
+add_library(
+    graph_http_obj OBJECT
+    GraphHttpHandler.cpp
+)
 
 add_subdirectory(test)
diff --git a/src/executor/test/CMakeLists.txt b/src/executor/test/CMakeLists.txt
@@ -125,6 +125,7 @@ add_executable(
     TestBase.cpp
     GraphHttpHandlerTest.cpp
     $<TARGET_OBJECTS:graph_obj>
+    $<TARGET_OBJECTS:graph_http_obj>
     $<TARGET_OBJECTS:client_cpp_obj>
     $<TARGET_OBJECTS:base_obj>
     $<TARGET_OBJECTS:graph_thrift_obj>