cmake: change prometheus source to git

Former-commit-id: ee0b45452cd7a5d695cabc31ab833b86a05c87ce

cpp/CHANGELOG.md

@@ -15,6 +15,7 @@ Please mark all change in change log and use the ticket from JIRA.
 - MS-64 - Different table can have different index type
 - MS-52 - Return search score
 - MS-66 - Support time range query
+- MS-72 - cmake: change prometheus source to git
 
 ## Task
 

cpp/cmake/ThirdPartyPackages.cmake

@@ -253,7 +253,8 @@ if (DEFINED ENV{MEGASEARCH_PROMETHEUS_URL})
     set(PROMETHEUS_SOURCE_URL "$ENV{PROMETHEUS_OPENBLAS_URL}")
 else ()
     set(PROMETHEUS_SOURCE_URL
-            "https://github.com/JinHai-CN/prometheus-cpp/archive/${PROMETHEUS_VERSION}.tar.gz")
+            #"https://github.com/JinHai-CN/prometheus-cpp/archive/${PROMETHEUS_VERSION}.tar.gz"
+            https://github.com/jupp0r/prometheus-cpp.git)
 endif()
 
 if (DEFINED ENV{MEGASEARCH_ROCKSDB_URL})
@@ -929,11 +930,20 @@ macro(build_prometheus)
             ${EP_COMMON_CMAKE_ARGS}
             -DCMAKE_INSTALL_LIBDIR=lib
             -DBUILD_SHARED_LIBS=OFF
-            "-DCMAKE_INSTALL_PREFIX=${PROMETHEUS_PREFIX}")
+            "-DCMAKE_INSTALL_PREFIX=${PROMETHEUS_PREFIX}"
+            -DCMAKE_BUILD_TYPE=Release)
 
     externalproject_add(prometheus_ep
-            URL
+            GIT_REPOSITORY
             ${PROMETHEUS_SOURCE_URL}
+            GIT_TAG
+            ${PROMETHEUS_VERSION}
+            GIT_SHALLOW
+            TRUE
+#            GIT_CONFIG
+#            recurse-submodules=true
+#            URL
+#            ${PROMETHEUS_SOURCE_URL}
             ${EP_LOG_OPTIONS}
             CMAKE_ARGS
             ${PROMETHEUS_CMAKE_ARGS}
@@ -991,7 +1001,7 @@ if(MEGASEARCH_WITH_PROMETHEUS)
     link_directories(SYSTEM ${PROMETHEUS_PREFIX}/core/)
     include_directories(SYSTEM ${PROMETHEUS_PREFIX}/core/include)
 
-    link_directories(${PROMETHEUS_PREFIX}/civetweb_ep-prefix/src/civetweb_ep)
+    #link_directories(${PROMETHEUS_PREFIX}/civetweb_ep-prefix/src/civetweb_ep)
 endif()
 
 # ----------------------------------------------------------------------

cpp/src/CMakeLists.txt

@@ -84,7 +84,6 @@ set(third_party_libs
         prometheus-cpp-push
         prometheus-cpp-pull
         prometheus-cpp-core
-        civetweb
         boost_system_static
         boost_filesystem_static
         boost_serialization_static
@@ -153,14 +152,14 @@ if (ENABLE_LICENSE STREQUAL "ON")
         target_link_libraries(vecwise_license ${license_libs} ${third_party_libs})
 endif ()
 
-#set(metrics_lib
-#        libprometheus-cpp-push.a
-#        libprometheus-cpp-pull.a
-#        libprometheus-cpp-core.a
-#        )
+set(metrics_lib
+        prometheus-cpp-push
+        prometheus-cpp-pull
+        prometheus-cpp-core
+        )
 
 #add_library(vecwise_engine STATIC ${metrics_files} )
-#target_link_libraries(metrics ${metrics_lib})
+target_link_libraries(metrics ${metrics_lib})
 
 set(server_libs
         vecwise_engine

cpp/thirdparty/versions.txt

@@ -31,7 +31,7 @@ GTEST_VERSION=1.8.1
 LAPACK_VERSION=v3.8.0
 LZ4_VERSION=v1.9.1
 OPENBLAS_VERSION=v0.3.6
-PROMETHEUS_VERSION=master
+PROMETHEUS_VERSION=v0.7.0
 ROCKSDB_VERSION=v6.0.2
 SNAPPY_VERSION=1.1.7
 SQLITE_VERSION=3280000
@@ -54,7 +54,7 @@ DEPENDENCIES=(
   "MEGASEARCH_LAPACK_URL lapack-${LAPACK_VERSION}.tar.gz https://github.com/Reference-LAPACK/lapack/archive/${LAPACK_VERSION}.tar.gz
   "MEGASEARCH_LZ4_URL lz4-${LZ4_VERSION}.tar.gz https://github.com/lz4/lz4/archive/${LZ4_VERSION}.tar.gz"
   "MEGASEARCH_OPENBLAS_URL openblas-${OPENBLAS_VERSION}.tar.gz https://github.com/xianyi/OpenBLAS/archive/${OPENBLAS_VERSION}.tar.gz"
-  "MEGASEARCH_PROMETHEUS_URL prometheus-${PROMETHEUS_VERSION}.tar.gz https://github.com/JinHai-CN/prometheus-cpp/archive/${PROMETHEUS_VERSION}.tar.gz"
+  "MEGASEARCH_PROMETHEUS_URL https://github.com/jupp0r/prometheus-cpp.git"
   "MEGASEARCH_ROCKSDB_URL rocksdb-${ROCKSDB_VERSION}.tar.gz https://github.com/facebook/rocksdb/archive/${ROCKSDB_VERSION}.tar.gz"
   "MEGASEARCH_SNAPPY_URL snappy-${SNAPPY_VERSION}.tar.gz https://github.com/google/snappy/archive/${SNAPPY_VERSION}.tar.gz"
   "MEGASEARCH_SQLITE_URL sqlite-autoconf-${SQLITE_VERSION}.tar.gz https://www.sqlite.org/2019/sqlite-autoconf-${SQLITE_VERSION}.tar.gz"