tests to embedded tests: replaced in cmake files

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

diff --git a/cmake/dbus/CMakeLists.txt b/cmake/dbus/CMakeLists.txt
index b807e67..0205f85 100644 (file)
--- a/cmake/dbus/CMakeLists.txt
+++ b/cmake/dbus/CMakeLists.txt
@@ -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
@@ -51,6 +52,7 @@ 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
@@ -147,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-asv-util.c
        ${DBUS_DIR}/dbus-auth-script.c
        ${DBUS_DIR}/dbus-auth-util.c
        ${DBUS_DIR}/dbus-credentials-util.c
@@ -157,22 +160,26 @@ 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
 )
 
-if (DBUS_BUILD_TESTS)
+if (DBUS_ENABLE_EMBEDDED_TESTS)
        set (DBUS_UTIL_SOURCES 
                ${DBUS_UTIL_SOURCES}
                ${DBUS_DIR}/dbus-test.c
        )
-endif (DBUS_BUILD_TESTS)
+endif (DBUS_ENABLE_EMBEDDED_TESTS)
 
 set (DBUS_UTIL_HEADERS
+       ${DBUS_DIR}/dbus-asv-util.h
        ${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
 )
@@ -181,6 +188,7 @@ set (DBUS_UTIL_HEADERS
 if (WIN32)
        set (DBUS_SHARED_SOURCES ${DBUS_SHARED_SOURCES} 
                ${DBUS_DIR}/dbus-file-win.c
+               ${DBUS_DIR}/dbus-init-win.cpp
                ${DBUS_DIR}/dbus-sysdeps-win.c
                ${DBUS_DIR}/dbus-pipe-win.c
                ${DBUS_DIR}/dbus-sysdeps-thread-win.c
@@ -259,11 +267,13 @@ if(WIN32)
     if(WINCE)
         target_link_libraries(dbus-1 ws2)
     else(WINCE)
-        target_link_libraries(dbus-1 ws2_32 advapi32 netapi32)
+        target_link_libraries(dbus-1 ws2_32 advapi32 netapi32 iphlpapi)
     endif(WINCE)
+else(WIN32)
+    target_link_libraries(dbus-1 ${CMAKE_THREAD_LIBS_INIT} rt)
 endif(WIN32)
 
-install_targets(/lib dbus-1 )
+install(TARGETS dbus-1 ${INSTALL_TARGETS_DEFAULT_ARGS})
 install_files(/include/dbus FILES ${dbusinclude_HEADERS})
 
 ### Internal library, used for the daemon, tools and tests, compiled statically.
@@ -282,17 +292,19 @@ if(WIN32)
     if(WINCE)
         target_link_libraries(dbus-internal ws2)
     else(WINCE)
-        target_link_libraries(dbus-internal ws2_32 advapi32 netapi32)
+        target_link_libraries(dbus-internal ws2_32 advapi32 netapi32 iphlpapi)
     endif(WINCE)
+else(WIN32)
+    target_link_libraries(dbus-internal ${CMAKE_THREAD_LIBS_INIT} rt)
 endif(WIN32)
 
-if (DBUS_BUILD_TESTS)
+if (DBUS_ENABLE_EMBEDDED_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_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)
+ENDIF (DBUS_ENABLE_EMBEDDED_TESTS)
 
 if (UNIX)
 # set version info