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

Fix build.

kishorencb9b3c58b2cd2
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 6bae9b30..a5d2dc2f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -22,7 +22,7 @@ jobs:
command: ls -latr /usr/local/lib/
- run:
name: build
- command: $PROJECT_DIR/build.sh --clean
+ command: $PROJECT_DIR/build.sh
- save_cache:
key: external-Linux-cache-{{ .Branch }}-{{ checksum "last-changed-git-sha-for-dependency-listing" }}
paths:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 63abad81..c65f4e47 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -88,8 +88,10 @@ link_directories(${DEP_ROOT_DIR}/${FOR_NAME})
link_directories(${DEP_ROOT_DIR}/${H2O_NAME}/build)
link_directories(${DEP_ROOT_DIR}/${ROCKSDB_NAME})
link_directories(${DEP_ROOT_DIR}/${ICONV_NAME}/lib/.libs)
+if (APPLE)
link_directories(${DEP_ROOT_DIR}/${BRPC_NAME}/lib)
link_directories(${DEP_ROOT_DIR}/${BRAFT_NAME}/lib)
+endif()
# Write dependency libraries to a file
file(WRITE ${DEP_ROOT_DIR}/libs.txt "")
@@ -153,9 +155,7 @@ set(ICU_ALL_LIBRARIES ${ICU_I18N_LIBRARIES} ${ICU_LIBRARIES} ${ICU_DATA_LIBRARIE
set(CORE_LIBS h2o-evloop iconv ${CURL_LIBRARIES} for ${ICU_ALL_LIBRARIES} ${G3LOGGER_LIBRARIES}
${ROCKSDB_LIBS} ${OPENSSL_LIBRARIES} pthread dl ${STD_LIB})
-message("GLOG library is: ${GLOG_LIBRARIES}")
-
-set(CORE_LIBS braft brpc ${LevelDB_LIBRARIES} ${GLOG_LIBRARIES} ${CORE_LIBS} ${GFLAGS_LIBRARIES} ${PROTOBUF_LIBRARIES} ${SYSTEM_LIBS})
+set(CORE_LIBS braft brpc ${LevelDB_LIBRARIES} glog ${CORE_LIBS} ${GFLAGS_LIBRARIES} ${PROTOBUF_LIBRARIES} ${SYSTEM_LIBS})
target_link_libraries(typesense-core ${CORE_LIBS})
target_link_libraries(typesense-server ${CORE_LIBS})
diff --git a/cmake/Modules/FindGlog.cmake b/cmake/Modules/FindGlog.cmake
deleted file mode 100644
index 1962427f..00000000
--- a/cmake/Modules/FindGlog.cmake
+++ /dev/null
@@ -1,39 +0,0 @@
-# - Try to find Glog
-#
-# The following variables are optionally searched for defaults
-# GLOG_ROOT_DIR: Base directory where all GLOG components are found
-#
-# The following are set after configuration is done:
-# GLOG_FOUND
-# GLOG_INCLUDE_DIRS
-# GLOG_LIBRARIES
-
-include(FindPackageHandleStandardArgs)
-
-if (NOT DEFINED GLOG_ROOT)
- set (GLOG_ROOT /usr /usr/local /usr/include/)
-endif (NOT DEFINED GLOG_ROOT)
-
-#set(GLOG_ROOT_DIR "" CACHE PATH "Folder contains Google glog")
-
-find_path(GLOG_INCLUDE_DIR glog/logging.h
- PATHS
- ${GLOG_ROOT_DIR}
- PATH_SUFFIXES
- src)
-
-find_library(GLOG_LIBRARY glog libglog
- PATHS
- ${GLOG_ROOT_DIR}
- PATH_SUFFIXES
- .libs
- lib
- lib64)
-
-find_package_handle_standard_args(GLOG DEFAULT_MSG
- GLOG_INCLUDE_DIR GLOG_LIBRARY)
-
-if(GLOG_FOUND)
- set(GLOG_INCLUDE_DIRS ${GLOG_INCLUDE_DIR})
- set(GLOG_LIBRARIES ${GLOG_LIBRARY})
-endif()
\ No newline at end of file