diff --git a/android/third-party/Folly/CMakeLists.txt b/android/third-party/Folly/CMakeLists.txt index 53efc79d4..48ca968f9 100644 --- a/android/third-party/Folly/CMakeLists.txt +++ b/android/third-party/Folly/CMakeLists.txt @@ -25,12 +25,8 @@ list(APPEND dir_list ${BOOST_DIR}/../) list(APPEND dir_list ${LIBEVENT_DIR}/) list(APPEND dir_list ${LIBEVENT_DIR}/include/) list(APPEND dir_list ${OPENSSL_DIR}) -#list(APPEND dir_list ${OPENSSL_DIR}/include) -#list(APPEND dir_list ${OPENSSL_DIR}/include/openssl) include_directories(${dir_list}) -# -DFOLLY_FORCE_CLOCK_GETTIME_DEFINITION=1 -std=c++14 - add_compile_options( -DFOLLY_HAVE_CLOCK_GETTIME=1 @@ -142,7 +138,5 @@ find_path(OPENSSL_LIBRARY libssl.so HINTS ${OPENSSL_LINK_DIRECTORIES}) message(STATUS "link_directories:- " ${LIBEVENT_LINK_DIRECTORIES}) install(TARGETS ${PACKAGE_NAME} DESTINATION ./build/) -# ${LIBEVENT_LINK_DIRECTORIES}/libevent.a -# event event_core event_extra target_link_libraries(${PACKAGE_NAME} glog double-conversion ${OPENSSL_LINK_DIRECTORIES}/libssl.so ${OPENSSL_LINK_DIRECTORIES}/libcrypto.so event event_extra event_core) diff --git a/android/third-party/LibEvent/CMakeLists.txt b/android/third-party/LibEvent/CMakeLists.txt index ea92685da..9cd1214d1 100644 --- a/android/third-party/LibEvent/CMakeLists.txt +++ b/android/third-party/LibEvent/CMakeLists.txt @@ -32,11 +32,7 @@ list(APPEND SRCFILES ${LIBEVENT_DIR}/event.c ${LIBEVENT_DIR}/strlcpy.c ) -#file(GLOB SRCFILES ${LIBEVENT_DIR}/*.c) - message(STATUS "DIR_LIST :- " ${DIR_LIST}) -#configure_file(${LIBEVENT_DIR}/evconfig-private.h.cmake ${LIBEVENT_DIR}/evconfig-private.h) -#configure_file(${LIBEVENT_DIR}/event-config.h.cmake ${LIBEVENT_DIR}/include/event2/event-config.h) add_library(${PACKAGE_NAME} SHARED ${SRCFILES}) install(TARGETS ${PACKAGE_NAME} DESTINATION ./build/) target_link_libraries(${PACKAGE_NAME})