Skip to content

Open Source alternative to Algolia + Pinecone and an Easier-to-Use alternative to ElasticSearch ⚡ 🔍 ✨ Fast, typo tolerant, in-memory fuzzy Search Engine for building delightful search experiences

G3logger should be linked statically.

Kishore Nallana268064e742a
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 95164726..59c46dbe 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -89,7 +89,10 @@ if(NOT APPLE)
list(APPEND ROCKSDB_LIBS rt)
endif()
-target_link_libraries(typesense-server h2o-evloop for miniutf g3logger pthread ${CURL_LIBRARIES} ${ROCKSDB_LIBS} ${OPENSSL_LIBRARIES} dl ${STD_LIB})
-target_link_libraries(search for miniutf g3logger pthread h2o-evloop ${CURL_LIBRARIES} ${ROCKSDB_LIBS} ${OPENSSL_LIBRARIES} dl ${STD_LIB})
-target_link_libraries(benchmark for miniutf g3logger pthread ${CURL_LIBRARIES} h2o-evloop ${ROCKSDB_LIBS} ${OPENSSL_LIBRARIES} dl ${STD_LIB})
-target_link_libraries(typesense_test h2o-evloop ${OPENSSL_LIBRARIES} pthread for miniutf g3logger ${ROCKSDB_LIBS} gtest gtest_main dl ${STD_LIB})
+# Specifically pick the static version since the build generates both static and dynamic libraries
+set(G3LOGGER "g3logger.a")
+
+target_link_libraries(typesense-server h2o-evloop for miniutf ${G3LOGGER} pthread ${CURL_LIBRARIES} ${ROCKSDB_LIBS} ${OPENSSL_LIBRARIES} dl ${STD_LIB})
+target_link_libraries(search for miniutf ${G3LOGGER} pthread h2o-evloop ${CURL_LIBRARIES} ${ROCKSDB_LIBS} ${OPENSSL_LIBRARIES} dl ${STD_LIB})
+target_link_libraries(benchmark for miniutf ${G3LOGGER} pthread ${CURL_LIBRARIES} h2o-evloop ${ROCKSDB_LIBS} ${OPENSSL_LIBRARIES} dl ${STD_LIB})
+target_link_libraries(typesense_test h2o-evloop ${OPENSSL_LIBRARIES} pthread for miniutf ${G3LOGGER} ${ROCKSDB_LIBS} gtest gtest_main dl ${STD_LIB})
diff --git a/cmake/Easyloggingpp.cmake b/cmake/Easyloggingpp.cmake
deleted file mode 100644
index bd8efdbf..00000000
--- a/cmake/Easyloggingpp.cmake
+++ /dev/null
@@ -1,38 +0,0 @@
-# Download and build EASYLOGGINGPP
-
-set(EASYLOGGINGPP_VERSION 9.95.3)
-set(EASYLOGGINGPP_NAME easyloggingpp-${EASYLOGGINGPP_VERSION})
-set(EASYLOGGINGPP_TAR_PATH ${DEP_ROOT_DIR}/${EASYLOGGINGPP_NAME}.tar.gz)
-
-if(NOT EXISTS ${EASYLOGGINGPP_TAR_PATH})
- message(STATUS "Downloading Easyloggingpp...")
- file(DOWNLOAD https://github.com/muflihun/easyloggingpp/archive/v${EASYLOGGINGPP_VERSION}.tar.gz ${EASYLOGGINGPP_TAR_PATH})
-endif()
-
-if(NOT EXISTS ${DEP_ROOT_DIR}/${EASYLOGGINGPP_NAME})
- message(STATUS "Extracting Easyloggingpp...")
- execute_process(COMMAND ${CMAKE_COMMAND} -E tar xzf ${EASYLOGGINGPP_TAR_PATH} WORKING_DIRECTORY ${DEP_ROOT_DIR})
-endif()
-
-if(NOT EXISTS ${DEP_ROOT_DIR}/${EASYLOGGINGPP_NAME}/build)
- message("Configuring Easyloggingpp...")
- file(MAKE_DIRECTORY ${DEP_ROOT_DIR}/${EASYLOGGINGPP_NAME}/build)
- execute_process(COMMAND ${CMAKE_COMMAND}
- "-Dbuild_static_lib=ON"
- "-H${DEP_ROOT_DIR}/${EASYLOGGINGPP_NAME}"
- "-B${DEP_ROOT_DIR}/${EASYLOGGINGPP_NAME}/build"
- RESULT_VARIABLE
- EASYLOGGINGPP_CONFIGURE)
- if(NOT EASYLOGGINGPP_CONFIGURE EQUAL 0)
- message(FATAL_ERROR "Easyloggingpp Configure failed!")
- endif()
-
- message("Building Easyloggingpp locally...")
- execute_process(COMMAND ${CMAKE_COMMAND} --build
- "${DEP_ROOT_DIR}/${EASYLOGGINGPP_NAME}/build"
- RESULT_VARIABLE
- EASYLOGGINGPP_BUILD)
- if(NOT EASYLOGGINGPP_BUILD EQUAL 0)
- message(FATAL_ERROR "Easyloggingpp build failed!")
- endif()
-endif()
\ No newline at end of file