build(cmake): cleanup lib links (#394)

rdsn @ 43478e29

-Subproject commit c3c13269083506ec28a7d3b931261f51b6c5f741
+Subproject commit 43478e298442a810f2bb9be4a5a81db2839c92f1

run.sh

@@ -536,7 +536,7 @@ function run_start_onebox()
     COLLECTOR_COUNT=0
     APP_NAME=temp
     PARTITION_COUNT=8
-    WAIT_HEALHY=false
+    WAIT_HEALTHY=false
     SERVER_PATH=${DSN_ROOT}/bin/pegasus_server
     CONFIG_FILE=""
     USE_PRODUCT_CONFIG=false
@@ -568,7 +568,7 @@ function run_start_onebox()
                 shift
                 ;;
             -w|--wait_healthy)
-                WAIT_HEALHY=true
+                WAIT_HEALTHY=true
                 ;;
             -s|--server_path)
                 SERVER_PATH="$2"
@@ -680,7 +680,7 @@ function run_start_onebox()
         cd ..
     fi
 
-    if [ $WAIT_HEALHY == "true" ]; then
+    if [ $WAIT_HEALTHY == "true" ]; then
         cd $ROOT
         echo "Wait cluster to become healthy..."
         sleeped=0

src/CMakeLists.txt

@@ -42,6 +42,10 @@ message (STATUS "pegasus Installation directory: CMAKE_INSTALL_PREFIX = " ${CMAK
 set(CMAKE_PREFIX_PATH ${PEGASUS_PROJECT_DIR}/rocksdb/build/output;${CMAKE_PREFIX_PATH})
 find_package(RocksDB REQUIRED) # RocksDB::rocksdb means librocksdb.a
 
+#prometheus
+set(CMAKE_PREFIX_PATH ${DSN_THIRDPARTY_ROOT};${CMAKE_PREFIX_PATH})
+find_package(prometheus-cpp)#TODO(huangwei5) make it optional
+
 add_subdirectory(base)
 add_subdirectory(reporter)
 add_subdirectory(base/test)

src/geo/bench/CMakeLists.txt

@@ -15,7 +15,6 @@ set(MY_PROJ_LIBS
         s2testing
         s2
         pegasus_client_static
-        fmt
         RocksDB::rocksdb
         )
 

src/geo/lib/CMakeLists.txt

@@ -13,7 +13,6 @@ set(MY_SRC_SEARCH_MODE "GLOB")
 set(MY_PROJ_LIBS ""
         # s2
         # pegasus_client_static
-        # fmt
         )
 
 set(MY_BOOST_LIBS Boost::system Boost::filesystem)

src/geo/test/CMakeLists.txt

@@ -15,7 +15,6 @@ set(MY_PROJ_LIBS
         s2testing
         s2
         pegasus_client_static
-        fmt
         gtest)
 
 set(MY_BOOST_LIBS Boost::system Boost::filesystem)

src/redis_protocol/proxy/CMakeLists.txt

@@ -12,15 +12,10 @@ set(MY_SRC_SEARCH_MODE "GLOB")
 set(MY_PROJ_LIBS pegasus.rproxylib
                  pegasus_geo_lib
                  pegasus_reporter
-                 prometheus-cpp-pull
-                 prometheus-cpp-push
-                 prometheus-cpp-core
-                 curl
-                 idn
                  event
                  s2
                  pegasus_client_static
-                 fmt)
+                 )
 
 set(MY_BINPLACES "config.ini")
 

src/redis_protocol/proxy_ut/CMakeLists.txt

@@ -10,17 +10,15 @@ set(MY_PROJ_SRC "")
 # "GLOB" for non-recursive search
 set(MY_SRC_SEARCH_MODE "GLOB")
 
-set(MY_PROJ_LIBS gtest pthread)
-
 set(MY_BOOST_LIBS Boost::system Boost::filesystem)
 
 set(MY_PROJ_LIBS pegasus.rproxylib
                 pegasus_base
-                ${MY_PROJ_LIBS}
                 pegasus_geo_lib
                 s2
                 pegasus_client_static
-                fmt)
+                gtest
+                )
 
 set(MY_BINPLACES "config.ini" "run.sh")
 

src/reporter/CMakeLists.txt

@@ -12,4 +12,6 @@ set(MY_SRC_SEARCH_MODE "GLOB")
 
 dsn_add_static_library()
 
-target_link_libraries(${MY_PROJ_NAME} PUBLIC pegasus_base) # TODO(huangwei5): dsn_add_static_library doesnt link libs, need fix
+target_link_libraries(${MY_PROJ_NAME} PUBLIC pegasus_base
+                                            prometheus-cpp::push
+                                            ) # TODO(huangwei5): dsn_add_static_library doesnt link libs, need fix

src/server/CMakeLists.txt

@@ -22,11 +22,6 @@ set(MY_PROJ_LIBS
     RocksDB::rocksdb
     pegasus_reporter
     pegasus_base
-    prometheus-cpp-pull
-    prometheus-cpp-push
-    prometheus-cpp-core
-    curl
-    idn
     pegasus_client_static
     zookeeper_mt
     event
@@ -35,11 +30,6 @@ set(MY_PROJ_LIBS
     PocoFoundation
     PocoNetSSL
     PocoJSON
-    crypto
-    fmt
-    rt
-    aio
-    pthread
     )
 
 set(MY_BOOST_LIBS Boost::system Boost::filesystem Boost::regex)

src/server/test/CMakeLists.txt

@@ -30,15 +30,8 @@ set(MY_PROJ_LIBS
         PocoFoundation
         PocoNetSSL
         PocoJSON
-        crypto
-        fmt
-        prometheus-cpp-push
-        prometheus-cpp-core
-        prometheus-cpp-pull
-        curl
         pegasus_base
         gtest
-        z rt aio pthread
         )
 add_definitions(-DPEGASUS_UNIT_TEST)
 add_definitions(-DENABLE_FAIL)

src/shell/CMakeLists.txt

@@ -26,14 +26,10 @@ set(MY_PROJ_LIBS
     PocoFoundation
     PocoNetSSL
     PocoJSON
-    crypto
-    fmt
     pegasus_geo_lib
     RocksDB::rocksdb
     s2
-    rt
-    aio
-    pthread)
+    )
 
 set(MY_BINPLACES "${CMAKE_CURRENT_SOURCE_DIR}/config.ini")
 

src/test/bench_test/CMakeLists.txt

@@ -13,7 +13,7 @@ set(MY_SRC_SEARCH_MODE "GLOB")
 set(MY_PROJ_LIBS
         pegasus_client_static
         RocksDB::rocksdb
-        fmt)
+        )
 
 set(MY_BOOST_LIBS Boost::system Boost::filesystem)
 

src/test/function_test/CMakeLists.txt

@@ -14,15 +14,9 @@ set(MY_PROJ_LIBS
     dsn.replication.ddlclient
     dsn_replication_common
     pegasus_client_static
-    fmt
+    gtest
     )
 
-if (UNIX)
-    set(MY_PROJ_LIBS ${MY_PROJ_LIBS} gtest pthread)
-else()
-    set(MY_PROJ_LIBS ${MY_PROJ_LIBS} gtest)
-endif()
-
 set(MY_BOOST_LIBS Boost::system Boost::filesystem Boost::regex)
 
 set(MY_BINPLACES "config.ini" "run.sh")