Merge branch 'dbus-1.4' of ssh://git.freedesktop.org/git/dbus/dbus into dbus-1.4

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

diff --git a/cmake/dbus/CMakeLists.txt b/cmake/dbus/CMakeLists.txt
index db46113..6a6c402 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)
 
@@ -57,10 +57,6 @@ set (DBUS_LIB_SOURCES
        ${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
 )
 
 
@@ -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} 
@@ -198,6 +193,14 @@ if (WIN32)
                ${DBUS_DIR}/dbus-spawn-win.c
                ${DBUS_DIR}/dbus-sysdeps-util-win.c
        )
+       if(WINCE)
+       set (DBUS_SHARED_SOURCES ${DBUS_SHARED_SOURCES}
+               ${DBUS_DIR}/dbus-sysdeps-wince-glue.c
+       )
+       set (DBUS_SHARED_HEADERS ${DBUS_SHARED_HEADERS}
+               ${DBUS_DIR}/dbus-sysdeps-wince-glue.h
+       )
+       endif(WINCE)
 else (WIN32)
        set (DBUS_SHARED_SOURCES ${DBUS_SHARED_SOURCES} 
                ${DBUS_DIR}/dbus-file-unix.c
@@ -205,12 +208,14 @@ else (WIN32)
                ${DBUS_DIR}/dbus-sysdeps-unix.c
                ${DBUS_DIR}/dbus-sysdeps-pthread.c
                ${DBUS_DIR}/dbus-userdb.c
+        ${DBUS_DIR}/sd-daemon.c
        )
        set (DBUS_SHARED_HEADERS ${DBUS_SHARED_HEADERS} 
                ${DBUS_DIR}/dbus-server-unix.h
                ${DBUS_DIR}/dbus-transport-unix.h
                ${DBUS_DIR}/dbus-sysdeps-unix.h
                ${DBUS_DIR}/dbus-userdb.h
+        ${DBUS_DIR}/sd-daemon.h
        )
        set (DBUS_UTIL_SOURCES ${DBUS_UTIL_SOURCES}
                ${DBUS_DIR}/dbus-spawn.c
@@ -251,12 +256,15 @@ 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)
-       target_link_libraries(dbus-1 ws2_32 advapi32 netapi32)
+    if(WINCE)
+        target_link_libraries(dbus-1 ws2)
+    else(WINCE)
+        target_link_libraries(dbus-1 ws2_32 advapi32 netapi32)
+    endif(WINCE)
 endif(WIN32)
 
 install_targets(/lib dbus-1 )
@@ -264,16 +272,30 @@ install_files(/include/dbus FILES ${dbusinclude_HEADERS})
 
 ### Internal library, used for the daemon, tools and tests, compiled statically.
 
-add_library(dbus-internal STATIC
+add_library(dbus-internal ${DBUS_INTERNAL_ADD_LIBRARY_OPTIONS}
+                       ${DBUS_LIB_SOURCES}
+                       ${DBUS_LIB_HEADERS}
+                       ${DBUS_SHARED_SOURCES}
+                       ${DBUS_SHARED_HEADERS}
                        ${DBUS_UTIL_SOURCES}
-                       ${DBUS_UTIL_HEADERS})
-target_link_libraries(dbus-internal dbus-1)
+                       ${DBUS_UTIL_HEADERS}
+)
+target_link_libraries(dbus-internal)
+set_target_properties(dbus-internal PROPERTIES COMPILE_FLAGS ${DBUS_INTERNAL_LIBRARY_DEFINITIONS})
+if(WIN32)
+    if(WINCE)
+        target_link_libraries(dbus-internal ws2)
+    else(WINCE)
+        target_link_libraries(dbus-internal ws2_32 advapi32 netapi32)
+    endif(WINCE)
+endif(WIN32)
 
 if (DBUS_BUILD_TESTS)
        set (TESTS_ENVIRONMENT "DBUS_TEST_DATA=${CMAKE_SOURCE_DIR}/test/data DBUS_TEST_HOMEDIR=${CMAKE_BUILD_DIR}/dbus")
        ADD_EXECUTABLE(dbus-test ${CMAKE_SOURCE_DIR}/../dbus/dbus-test-main.c)
-       target_link_libraries(dbus-test dbus-1 dbus-internal)
+       target_link_libraries(dbus-test ${DBUS_INTERNAL_LIBRARIES})
        add_test(dbus-test ${EXECUTABLE_OUTPUT_PATH}/dbus-test ${CMAKE_SOURCE_DIR}/../test/data)
+       set_target_properties(dbus-test PROPERTIES COMPILE_FLAGS ${DBUS_INTERNAL_CLIENT_DEFINITIONS})
 ENDIF (DBUS_BUILD_TESTS)
 
 if (UNIX)