tevent: fix CMake problems

metze

diff --git a/lib/tevent/CMakeLists.txt b/lib/tevent/CMakeLists.txt
index 0f25f72c4bb49ccb46d0bab933b9305e7b89bbae..4b3a4b061870c7dc14b386a3fa32da0b223bf2ca 100644 (file)
--- a/lib/tevent/CMakeLists.txt
+++ b/lib/tevent/CMakeLists.txt
@@ -49,8 +49,8 @@ if (NOT WITH_LIBTEVENT)
 
           add_subdirectory(${LIBTEVENT_SOURCE_DIR}/../talloc ${LIBTEVENT_BINARY_DIR}/talloc)
 
-          set (TALLOC_INCLUDE_DIRS ${TALLOC_PUBLIC_INCLUDE_DIRS})
-          set (TALLOC_LIBRARIES ${TALLOC_LIBARY})
+          set (TALLOC_INCLUDE_DIRS ${LIBTALLOC_PUBLIC_INCLUDE_DIRS})
+          set (TALLOC_LIBRARIES ${LIBTALLOC_LIBRARY})
         else (EXISTS ${LIBTEVENT_SOURCE_DIR}/../talloc)
             message(FATAL_ERROR "Could not find talloc")
         endif (EXISTS ${LIBTEVENT_SOURCE_DIR}/../talloc)
@@ -69,7 +69,7 @@ set(LIBTEVENT_SOVERSION "0")
 
 # define include dirs and the library for later use and cache it.
 set(LIBTEVENT_PUBLIC_INCLUDE_DIRS
-    ${TALLOC_INCLUDE_DIRS}
+    ${LIBTALLOC_INCLUDE_DIRS}
     ${LIBTEVENT_SOURCE_DIR}
     CACHE INTERNAL "libreplace public include directories"
 )
@@ -97,7 +97,6 @@ set(tevent_SRCS
     tevent_debug.c
     tevent_fd.c
     tevent_immediate.c
-    tevent_liboop.c
     tevent_queue.c
     tevent_req.c
     tevent_select.c
@@ -111,13 +110,14 @@ set(tevent_SRCS
 if (HAVE_SYS_EPOLL_H AND HAVE_EPOLL_CREATE)
     add_definitions(-DHAVE_SYS_EPOLL_H=1 -DHAVE_EPOLL_CREATE=2)
     set(tevent_SRCS
+        ${tevent_SRCS}
         tevent_epoll.c
     )
 endif (HAVE_SYS_EPOLL_H AND HAVE_EPOLL_CREATE)
 
 # build libraries and binaries
 add_library(${LIBTEVENT_LIBRARY} SHARED ${tevent_SRCS})
-target_link_libraries(${LIBTEVENT_LIBRARY} ${LIBREPLACE_LIBRARY} ${TALLOC_LIBARIES})
+target_link_libraries(${LIBTEVENT_LIBRARY} ${LIBREPLACE_LIBRARY} ${LIBTALLOC_LIBRARY})
 
 set_target_properties(
     ${LIBTEVENT_LIBRARY}