From d80b063fa0ba23736e187fbabd32cb0f14134f8a Mon Sep 17 00:00:00 2001 From: Pritesh Nandgaonkar Date: Wed, 13 Jun 2018 21:41:37 +0100 Subject: [PATCH] changes in cmake of libevent --- android/build.gradle | 2 +- android/third-party/LibEvent/CMakeLists.txt | 30 ++++++++++++++++++++- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index b1acc1324..7e75c6495 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -152,7 +152,7 @@ task prepareAllLibs() { dependsOn prepareDoubleConversion dependsOn prepareBoost dependsOn prepareFolly - dependsOn finalizeEvent + dependsOn prepareLibEvent dependsOn finalizeOpenSSL } diff --git a/android/third-party/LibEvent/CMakeLists.txt b/android/third-party/LibEvent/CMakeLists.txt index 2f0cefda1..52a275068 100644 --- a/android/third-party/LibEvent/CMakeLists.txt +++ b/android/third-party/LibEvent/CMakeLists.txt @@ -7,8 +7,36 @@ set(LIBEVENT_DIR libevent-release-2.1.8-stable) list(APPEND DIR_LIST ${LIBEVENT_DIR}/) list(APPEND DIR_LIST ${LIBEVENT_DIR}/include) include_directories(${DIR_LIST}) -file(GLOB SRCFILES ${LIBEVENT_DIR}/*.c) +list(APPEND SRCFILES ${LIBEVENT_DIR}/buffer.c + ${LIBEVENT_DIR}/bufferevent.c + ${LIBEVENT_DIR}/bufferevent_filter.c + ${LIBEVENT_DIR}/bufferevent_ratelim.c + ${LIBEVENT_DIR}/bufferevent_sock.c + ${LIBEVENT_DIR}/epoll.c + ${LIBEVENT_DIR}/epoll_sub.c + ${LIBEVENT_DIR}/evdns.c + ${LIBEVENT_DIR}/event.c + ${LIBEVENT_DIR}/event_tagging.c + ${LIBEVENT_DIR}/evmap.c + ${LIBEVENT_DIR}/evrpc.c + ${LIBEVENT_DIR}/evthread.c + ${LIBEVENT_DIR}/evthread_pthread.c + ${LIBEVENT_DIR}/evutil.c + ${LIBEVENT_DIR}/evutil_rand.c + ${LIBEVENT_DIR}/http.c + ${LIBEVENT_DIR}/listener.c + ${LIBEVENT_DIR}/log.c + ${LIBEVENT_DIR}/poll.c + ${LIBEVENT_DIR}/select.c + ${LIBEVENT_DIR}/signal.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})