G3logger should be linked statically.

This commit is contained in:
Kishore Nallan 2018-02-02 20:05:37 -05:00
parent c27580a419
commit a268064e74
2 changed files with 7 additions and 42 deletions

View File

@ -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})

View File

@ -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()