change CMakelist

apache · Aug 2, 2019 · 3cd3356 · 3cd3356
1 parent 636fb6c
commit 3cd3356
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 25 deletions.
diff --git a/rocksdb b/rocksdb
diff --git a/src/redis_protocol/proxy/CMakeLists.txt b/src/redis_protocol/proxy/CMakeLists.txt
@@ -15,9 +15,9 @@ set(MY_PROJ_LIBS pegasus.rproxylib
                  pegasus.base
                  pegasus_geo_lib
                  pegasus_reporter
-                 prometheus-cpp-core
                  prometheus-cpp-pull
                  prometheus-cpp-push
+                 prometheus-cpp-core
                  curl
                  event
                  s2

diff --git a/src/redis_protocol/proxy_lib/CMakeLists.txt b/src/redis_protocol/proxy_lib/CMakeLists.txt
@@ -11,11 +11,7 @@ set(MY_SRC_SEARCH_MODE "GLOB")
 
 set(MY_PROJ_INC_PATH "../../include" "../../base")
 
-set(MY_PROJ_LIBS curl
-                 prometheus-cpp-core
-                 prometheus-cpp-pull
-                 prometheus-cpp-push
-                 )
+set(MY_PROJ_LIBS "")
 
 set(MY_PROJ_LIB_PATH "")
 

diff --git a/src/reporter/CMakeLists.txt b/src/reporter/CMakeLists.txt
@@ -9,22 +9,8 @@ set(MY_PROJ_SRC "")
 # "GLOB_RECURSE" for recursive search
 # "GLOB" for non-recursive search
 set(MY_SRC_SEARCH_MODE "GLOB")
-include_directories(../../rdsn/thirdparty/output)
-link_directories(../../rdsn/thirdparty/output/lib)
-link_libraries(
-	"libprometheus-cpp-core.so"
-	"libprometheus-cpp-push.so"
-	"libprometheus-cpp-pull.so")
+# set(MY_PROJ_LIB_PATH "../../rdsn/thirdparty/output/lib")
+#set(MY_PROJ_INC_PATH "../../rdsn/thirdparty/output/include")
 
 
-set(MY_PROJ_LIBS 
-	prometheus-cpp-core
-	prometheus-cpp-pull
-	prometheus-cpp-push
-	curl
-	${MY_PROJ_LIBS}
-	)
-
-set(MY_BINPLACES "config.ini")
-
 dsn_add_static_library()
diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt
@@ -26,9 +26,9 @@ set(MY_PROJ_LIBS
     dsn.failure_detector.multimaster
     dsn.replication.zookeeper_provider
     pegasus_reporter
-    prometheus-cpp-core
     prometheus-cpp-pull
     prometheus-cpp-push
+    prometheus-cpp-core
     curl
     pegasus_client_static
     zookeeper_mt

diff --git a/src/server/test/CMakeLists.txt b/src/server/test/CMakeLists.txt
@@ -33,9 +33,9 @@ set(MY_PROJ_LIBS
         PocoJSON
         crypto
         fmt
+        prometheus-cpp-push
         prometheus-cpp-core
         prometheus-cpp-pull
-        prometheus-cpp-push
         curl
         ${ROCKSDB_LINK_LIBRARIES}
         pegasus.base