Fix cmake linux build: dbus-1 and dbus-internal require to link to rt library

[platform/upstream/dbus.git] / cmake / dbus / CMakeLists.txt

diff --git a/cmake/dbus/CMakeLists.txt b/cmake/dbus/CMakeLists.txt
index f13e678..8a40171 100644 (file)
--- a/cmake/dbus/CMakeLists.txt
+++ b/cmake/dbus/CMakeLists.txt
@@ -2,7 +2,7 @@ project(dbus-lib)
 
 SET(DBUS_DIR ${CMAKE_SOURCE_DIR}/../dbus)
 
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/dbus-arch-deps.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/dbus-arch-deps.h )
+configure_file(${DBUS_DIR}/dbus-arch-deps.h.in ${CMAKE_CURRENT_BINARY_DIR}/dbus-arch-deps.h )
 
 add_definitions(-DDBUS_COMPILATION)
 
@@ -21,6 +21,7 @@ set (dbusinclude_HEADERS
        ${DBUS_DIR}/dbus-server.h
        ${DBUS_DIR}/dbus-shared.h
        ${DBUS_DIR}/dbus-signature.h
+       ${DBUS_DIR}/dbus-syntax.h
        ${DBUS_DIR}/dbus-threads.h
        ${DBUS_DIR}/dbus-types.h
        dbus-arch-deps.h
@@ -31,7 +32,6 @@ set (dbusinclude_HEADERS
 set (DBUS_LIB_SOURCES
        ${DBUS_DIR}/dbus-address.c
        ${DBUS_DIR}/dbus-auth.c
-       ${DBUS_DIR}/dbus-auth-script.c
        ${DBUS_DIR}/dbus-bus.c
        ${DBUS_DIR}/dbus-connection.c
        ${DBUS_DIR}/dbus-credentials.c
@@ -52,15 +52,12 @@ set (DBUS_LIB_SOURCES
        ${DBUS_DIR}/dbus-server-debug-pipe.c
        ${DBUS_DIR}/dbus-sha.c
        ${DBUS_DIR}/dbus-signature.c
+       ${DBUS_DIR}/dbus-syntax.c
        ${DBUS_DIR}/dbus-timeout.c
        ${DBUS_DIR}/dbus-threads.c
        ${DBUS_DIR}/dbus-transport.c
        ${DBUS_DIR}/dbus-transport-socket.c
        ${DBUS_DIR}/dbus-watch.c
-#dbus-md5.c
-#
-#  find a clean Windows implementation
-#  and move code to a *-win.c file
 )
 
 
@@ -78,7 +75,6 @@ endif(UNIX)
 
 set (DBUS_LIB_HEADERS
        ${DBUS_DIR}/dbus-auth.h
-       ${DBUS_DIR}/dbus-auth-script.h
        ${DBUS_DIR}/dbus-connection-internal.h
        ${DBUS_DIR}/dbus-credentials.h
        ${DBUS_DIR}/dbus-keyring.h
@@ -103,7 +99,6 @@ set (DBUS_LIB_HEADERS
        ${DBUS_DIR}/dbus-transport-protected.h
        ${DBUS_DIR}/dbus-watch.h
        ${CMAKE_BINARY_DIR}/config.h
-##dbus-md5.h
 )
 if(UNIX)
        set (DBUS_LIB_HEADERS ${DBUS_LIB_HEADERS} 
@@ -154,6 +149,7 @@ set (DBUS_SHARED_HEADERS
 ### should be underscore-prefixed but don't really need 
 ### to be unless they move to DBUS_SHARED_SOURCES later)
 set (DBUS_UTIL_SOURCES
+       ${DBUS_DIR}/dbus-auth-script.c
        ${DBUS_DIR}/dbus-auth-util.c
        ${DBUS_DIR}/dbus-credentials-util.c
        ${DBUS_DIR}/dbus-mainloop.c
@@ -163,6 +159,8 @@ set (DBUS_UTIL_SOURCES
        ${DBUS_DIR}/dbus-message-factory.c
        ${DBUS_DIR}/dbus-message-util.c
        ${DBUS_DIR}/dbus-shell.c
+       ${DBUS_DIR}/dbus-socket-set.c
+       ${DBUS_DIR}/dbus-socket-set-poll.c
        ${DBUS_DIR}/dbus-string-util.c
        ${DBUS_DIR}/dbus-sysdeps-util.c
 )
@@ -175,9 +173,11 @@ if (DBUS_BUILD_TESTS)
 endif (DBUS_BUILD_TESTS)
 
 set (DBUS_UTIL_HEADERS
+       ${DBUS_DIR}/dbus-auth-script.h
        ${DBUS_DIR}/dbus-mainloop.h
        ${DBUS_DIR}/dbus-message-factory.h
        ${DBUS_DIR}/dbus-shell.h
+       ${DBUS_DIR}/dbus-socket-set.h
        ${DBUS_DIR}/dbus-spawn.h
        ${DBUS_DIR}/dbus-test.h
 )
@@ -232,15 +232,11 @@ endif (WIN32)
 set(libdbus_SOURCES
        ${DBUS_LIB_SOURCES}
        ${DBUS_SHARED_SOURCES}
-       # for debugging
-       ${DBUS_UTIL_SOURCES}
 )
 
 set(libdbus_HEADERS 
        ${DBUS_LIB_HEADERS}
        ${DBUS_SHARED_HEADERS}
-       # for debugging
-       ${DBUS_UTIL_HEADERS}
 )
 if (MSVC)
     set (BUILD_FILEVERSION ${DBUS_MAJOR_VERSION},${DBUS_MINOR_VERSION},${DBUS_MICRO_VERSION},${DBUS_PATCH_VERSION})
@@ -261,16 +257,17 @@ endif(MSVC_IDE)
 ### Client library
 
 add_library(dbus-1 SHARED
-                       ${DBUS_LIB_SOURCES}
-                       ${DBUS_SHARED_SOURCES}
-                       ${DBUS_LIB_HEADERS}
-                       ${DBUS_SHARED_HEADERS})
+                       ${libdbus_SOURCES}
+                       ${libdbus_HEADERS}
+)
 if(WIN32)
     if(WINCE)
         target_link_libraries(dbus-1 ws2)
     else(WINCE)
         target_link_libraries(dbus-1 ws2_32 advapi32 netapi32)
     endif(WINCE)
+else(WIN32)
+    target_link_libraries(dbus-1 ${CMAKE_THREAD_LIBS_INIT} rt)
 endif(WIN32)
 
 install_targets(/lib dbus-1 )
@@ -294,6 +291,8 @@ if(WIN32)
     else(WINCE)
         target_link_libraries(dbus-internal ws2_32 advapi32 netapi32)
     endif(WINCE)
+else(WIN32)
+    target_link_libraries(dbus-internal ${CMAKE_THREAD_LIBS_INIT} rt)
 endif(WIN32)
 
 if (DBUS_BUILD_TESTS)