fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-05-04 21:08:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge changes done to the cmake-buildsystem from the sf.net windbus-svn trunk. tested and works fine with at least msvc2008. (cherry picked from commit 45c168fd61e3f6447e014df4bb6417efbe725ccd)

Browse source
This commit is contained in:
Christian Ehrlicher 2009-04-24 11:36:50 +02:00 • committed by unknown
parent a83b7cb80c
commit 4668480458
8 changed files with 1105 additions and 161 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

137
cmake/CMakeLists.txt
View file

@ -2,19 +2,28 @@ set (PACKAGE dbus)
# the version major, minor and release number should be synchron to the dbus cvs - windows releases should only update the patch level
set (VERSION_MAJOR "1")
set (VERSION_MINOR "1")
set (VERSION_RELEASE "1")
set (VERSION_PATCH "2")
set (VERSION_MINOR "2")
set (VERSION_RELEASE "14")
set (VERSION_PATCH "0")
if (VERSION_PATCH)
set (VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_RELEASE}-${VERSION_PATCH}" )
else (VERSION_PATCH)
set (VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_RELEASE}" )
endif (VERSION_PATCH)
set (DBUS_MAJOR_VERSION ${VERSION_MAJOR})
set (DBUS_MINOR_VERSION ${VERSION_MAJOR})
set (DBUS_MICRO_VERSION ${VERSION_MAJOR})
set (DBUS_MAJOR_VERSION ${VERSION_MAJOR})
set (DBUS_VERSION ${VERSION})
set (DBUS_VERSION_STRING "${VERSION}")
project(${PACKAGE})
# we need to be up to date
CMAKE_MINIMUM_REQUIRED(VERSION 2.4.4 FATAL_ERROR)
if(COMMAND cmake_policy)
cmake_policy(SET CMP0003 NEW)
endif(COMMAND cmake_policy)
# where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked
set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/modules")
@ -25,7 +34,7 @@ SET(BUILD_SHARED_LIBS ON)
if (CYGWIN)
set (WIN32)
endif (CYGWIN)
# search for required packages
if (WIN32)
# include local header first to avoid using old installed header
@ -43,7 +52,7 @@ find_package(X11)
# do config checks
INCLUDE(ConfigureChecks.cmake)
# @TODO: how to remove last dir from ${CMAKE_SOURCE_DIR} ?
# @TODO: how to remove last dir from ${CMAKE_SOURCE_DIR} ?
SET(DBUS_SOURCE_DIR ${CMAKE_SOURCE_DIR}/..)
# make some more macros available
@ -62,19 +71,19 @@ if(MSVC)
set(GROUP_CODE flat)
endif(NOT GROUP_CODE)
ADD_DEFINITIONS(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE)
# Use the highest warning level
if (WALL)
set(WALL 1 CACHE TYPE STRING FORCE)
set(CMAKE_CXX_WARNING_LEVEL 4 CACHE TYPE STRING FORCE)
if(CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
STRING(REGEX REPLACE "/W[0-4]" "/W4" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
else(CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4")
endif(CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
if(CMAKE_C_FLAGS MATCHES "/W[0-4]")
STRING(REGEX REPLACE "/W[0-4]" "/W4" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
else(CMAKE_C_FLAGS MATCHES "/W[0-4]")
@ -83,19 +92,20 @@ if(MSVC)
else (WALL)
set(CMAKE_CXX_WARNING_LEVEL 3 CACHE TYPE STRING FORCE)
endif (WALL)
SET(MSVC_W_ERROR " /we4028 /we4013 /we4133 /we4047 /we4031 /we4002 /we4003 /we4114")
SET(MSVC_W_DISABLE " /wd4127 /wd4090 /wd4101 /wd4244")
SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /FIconfig.h ${MSVC_W_ERROR} ${MSVC_W_DISABLE}")
SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /FIconfig.h ${MSVC_W_ERROR} ${MSVC_W_DISABLE}")
endif(MSVC)
if(CMAKE_BUILD_TYPE STREQUAL "Debug")
# used by executables, CMAKE_DEBUG_POSTFIX does not handle this case
#set (CMAKE_EXE_POSTFIX "d")
#set (CMAKE_DEBUG_POSTFIX "d")
endif(CMAKE_BUILD_TYPE STREQUAL "Debug")
endif(MSVC)
if(WIN32)
set (CMAKE_DEBUG_POSTFIX "d")
endif(WIN32)
#########################################################################
# Windows CE
@ -110,9 +120,9 @@ if(wince)
# don't forget parameters
set(wince 1 CACHE TYPE STRING FORCE)
set(wcelibcex ${wcelibcex} CACHE TYPE STRING FORCE)
include_directories(${wcelibcex}/include/wcelibcex ${wcelibcex}/src)
add_definitions(
# see config.h.cmake
# -DDBUS_WINCE
@ -123,22 +133,22 @@ if(wince)
-DUNICODE
-DPOCKETPC2003_UI_MODEL
)
# Windows CE Version
add_definitions(
-D_WIN32_WCE=0x420
-DWIN32_PLATFORM_PSPC=0x420
-DUNDER_CE=0x420
)
# Architecture
add_definitions(
-DARM
-D_ARM_
)
set(CMAKE_CXX_STANDARD_LIBRARIES "coredll.lib corelibc.lib ole32.lib oleaut32.lib uuid.lib commctrl.lib ws2.lib")
set(CMAKE_SHARED_LINKER_FLAGS "/subsystem:windowsce,4.20 /machine:THUMB")
endif(wince)
@ -167,8 +177,7 @@ endif (WIN32 OR CYGWIN)
set (EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin)
# for including config.h and for includes like <dir/foo.h>
include_directories( ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} )
include_directories( ${CMAKE_INCLUDE_PATH} )
include_directories( ${CMAKE_SOURCE_DIR}/.. ${CMAKE_BINARY_DIR} ${CMAKE_INCLUDE_PATH} )
# linker search directories
link_directories(${DBUS_LIB_DIR} ${LIBRARY_OUTPUT_PATH} )
@ -190,7 +199,7 @@ endif (DBUSDIR)
if (NOT DBUS_INSTALL_DIR)
set(DBUS_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}" CACHE TYPE STRING)
endif (NOT DBUS_INSTALL_DIR)
# TODO: setting EXPANDED_... has nothing to do with DBUS_INSTALL_SYSTEM_LIBS
if (DBUS_INSTALL_SYSTEM_LIBS)
set(prefix ${DBUS_INSTALL_DIR})
@ -208,7 +217,7 @@ else (DBUS_INSTALL_SYSTEM_LIBS)
if (MSVC_IDE)
set(EXPANDED_BINDIR ${CMAKE_BINARY_DIR}/bin/debug)
else (MSVC_IDE)
set(EXPANDED_BINDIR ${CMAKE_BINARY_DIR}/bin)
set(EXPANDED_BINDIR ${CMAKE_BINARY_DIR}/bin)
endif (MSVC_IDE)
set(DBUS_BINDIR ${EXPANDED_BINDIR})
set(DBUS_MACHINE_UUID_FILE ${CMAKE_BINARY_DIR}/lib/dbus/machine-id)
@ -217,15 +226,15 @@ endif (DBUS_INSTALL_SYSTEM_LIBS)
set (DBUS_DAEMONDIR ${EXPANDED_BINDIR})
########### command line options ###############
# TODO: take check from configure.in
# TODO: take check from configure.in
#AC_ARG_ENABLE(tests, AS_HELP_STRING([--enable-tests],[enable unit test code]),enable_tests=$enableval,enable_tests=$USE_MAINTAINER_MODE)
OPTION(DBUS_BUILD_TESTS "enable unit test code" ON)
if (DBUS_BUILD_TESTS)
if (DBUS_BUILD_TESTS)
if(NOT MSVC AND NOT CMAKE_BUILD_TYPE MATCHES Release)
add_definitions(-g)
endif(NOT MSVC AND NOT CMAKE_BUILD_TYPE MATCHES Release)
endif (DBUS_BUILD_TESTS)
endif (DBUS_BUILD_TESTS)
# win32 dbus service support - this support is not complete
OPTION(DBUS_SERVICE "enable dbus service installer" OFF)
@ -237,7 +246,7 @@ if(DBUS_ENABLE_ANSI)
add_definitions(-ansi -D_POSIX_C_SOURCE=199309L -D_BSD_SOURCE -pedantic)
else(NOT MSVC)
add_definitions(-Za -D_POSIX_C_SOURCE=199309L -D_BSD_SOURCE -W4)
endif(NOT MSVC)
endif(NOT MSVC)
endif(DBUS_ENABLE_ANSI)
#AC_ARG_ENABLE(verbose-mode, AS_HELP_STRING([--enable-verbose-mode],[support verbose debug mode]),enable_verbose_mode=$enableval,enable_verbose_mode=$USE_MAINTAINER_MODE)
@ -257,7 +266,7 @@ if(DBUS_GCOV_ENABLED)
# FIXME!!!!
## remove optimization
# CFLAGS=`echo "$CFLAGS" | sed -e 's/-O[0-9]*//g'`
endif(NOT MSVC)
endif(NOT MSVC)
endif(DBUS_GCOV_ENABLED)
#AC_ARG_ENABLE(abstract-sockets, AS_HELP_STRING([--enable-abstract-sockets],[use abstract socket namespace (linux only)]),enable_abstract_sockets=$enableval,enable_abstract_sockets=auto)
@ -351,12 +360,34 @@ if (WIN32)
set (EXT ".exe")
endif(WIN32)
set(TEST_SERVICE_DIR ${CMAKE_BINARY_DIR}/test/data/valid-service-files CACHE STRING "Full path to test file test/data/valid-service-files in builddir")
set(TEST_SERVICE_BINARY ${CMAKE_BINARY_DIR}/bin/test-service${EXT} CACHE STRING "Full path to test file test/test-service in builddir")
set(TEST_SHELL_SERVICE_BINARY ${CMAKE_BINARY_DIR}/bin/test-shell-service${EXT} CACHE STRING "Full path to test file test/test-shell-service in builddir")
set(TEST_EXIT_BINARY ${CMAKE_BINARY_DIR}/bin/test-exit${EXT} CACHE STRING "Full path to test file test/test-exit in builddir")
set(TEST_SEGFAULT_BINARY ${CMAKE_BINARY_DIR}/bin/test-segfault${EXT} CACHE STRING "Full path to test file test/test-segfault in builddir")
set(TEST_SLEEP_FOREVER_BINARY ${CMAKE_BINARY_DIR}/bin/test-sleep-forever${EXT} CACHE STRING "Full path to test file test/test-sleep-forever in builddir")
if (MSVC_IDE)
if (test_debug)
set(test_debug TRUE CACHE TYPE STRING FORCE)
set(IDE_BIN Debug/ )
message(STATUS)
message(STATUS "Using Visual Studio: test programs will only work with the 'Debug' configuration!")
message(STATUS "To run the tests with the 'Release' configuration use -Dtest_debug=0")
message(STATUS "Add '..\\..\\test\\data' to the command line option of the test programs")
message(STATUS)
else (test_debug)
set(test_debug FALSE CACHE TYPE STRING FORCE)
set(IDE_BIN Release/)
message(STATUS)
message(STATUS "Using Visual Studio: test programs will only work with the 'Release' configuration!")
message(STATUS "To run the tests with the 'Debug' configuration use -Dtest_debug=1")
message(STATUS "Add '..\\..\\test\\data' to the command line option of the test programs")
message(STATUS)
endif (test_debug)
set (TEST_PATH_FORCE FORCE)
FILE(REMOVE ${CMAKE_BINARY_DIR}/data/dbus-1/services)
endif (MSVC_IDE)
set(TEST_SERVICE_DIR ${CMAKE_BINARY_DIR}/test/data/valid-service-files CACHE STRING "Full path to test file test/data/valid-service-files in builddir" )
set(TEST_SERVICE_BINARY ${CMAKE_BINARY_DIR}/bin/${IDE_BIN}test-service${EXT} CACHE STRING "Full path to test file test/test-service in builddir" ${TEST_PATH_FORCE})
set(TEST_SHELL_SERVICE_BINARY ${CMAKE_BINARY_DIR}/bin/${IDE_BIN}test-shell-service${EXT} CACHE STRING "Full path to test file test/test-shell-service in builddir" ${TEST_PATH_FORCE})
set(TEST_EXIT_BINARY ${CMAKE_BINARY_DIR}/bin/${IDE_BIN}test-exit${EXT} CACHE STRING "Full path to test file test/test-exit in builddir" ${TEST_PATH_FORCE})
set(TEST_SEGFAULT_BINARY ${CMAKE_BINARY_DIR}/bin/${IDE_BIN}test-segfault${EXT} CACHE STRING "Full path to test file test/test-segfault in builddir" ${TEST_PATH_FORCE})
set(TEST_SLEEP_FOREVER_BINARY ${CMAKE_BINARY_DIR}/bin/${IDE_BIN}test-sleep-forever${EXT} CACHE STRING "Full path to test file test/test-sleep-forever in builddir" ${TEST_PATH_FORCE})
#### Find socket directories
if (NOT WIN32)
@ -386,7 +417,7 @@ endif (NOT WIN32)
#else
# DBUS_SYSTEM_PID_FILE=${EXPANDED_LOCALSTATEDIR}/run/dbus/pid
#fi
# TODO: fix redhet
# TODO: fix redhet
if (WIN32)
# bus-test expects a non empty string
set (DBUS_SYSTEM_PID_FILE "/dbus-pid")
@ -410,12 +441,12 @@ set (DBUS_USER )
if (WIN32)
set (DBUS_SESSION_BUS_DEFAULT_ADDRESS "tcp:host=localhost,port=12434")
set (DBUS_SYSTEM_BUS_DEFAULT_ADDRESS "tcp:host=localhost,port=12434")
set (DBUS_SESSION_BUS_DEFAULT_ADDRESS "tcp:host=localhost,port=0")
set (DBUS_SYSTEM_BUS_DEFAULT_ADDRESS "tcp:host=localhost,port=0")
set (DBUS_SYSTEM_CONFIG_FILE "etc/system.conf")
set (DBUS_SESSION_CONFIG_FILE "etc/session.conf")
# bus-test expects a non empty string
set (DBUS_USER "Administrator")
set (DBUS_USER "Administrator")
set (DBUS_DATADIR "data")
else (WIN32)
set (DBUS_SYSTEM_BUS_DEFAULT_ADDRESS unix:tmpdir=)
@ -424,30 +455,48 @@ else (WIN32)
set (configdir ${sysconfdir}/dbus-1 )
set (DBUS_SYSTEM_CONFIG_FILE ${configdir}/system.conf)
set (DBUS_SESSION_CONFIG_FILE ${configdir}/session.conf)
set (DBUS_USER "root")
set (DBUS_USER "root")
set (DBUS_DATADIR ${EXPANDED_DATADIR})
endif (WIN32)
set (DAEMON_NAME dbus-daemon)
set (DAEMON_NAME dbus-daemon)
########### create config.h ###############
#include(ConfigureChecks.cmake)
# better use flags for gcc
# better use flags for gcc
if (MINGW)
set (HAVE_GNUC_VARARGS 1)
endif(MINGW)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h )
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/dbus-env.bat.cmake ${CMAKE_BINARY_DIR}/bin/dbus-env.bat )
install_files(/bin FILES ${CMAKE_BINARY_DIR}/bin/dbus-env.bat)
install_files(/bin FILES ${CMAKE_BINARY_DIR}/bin/dbus-env.bat)
# compiler definitions
# compiler definitions
add_definitions(-DHAVE_CONFIG_H=1)
add_definitions(${DBUS_BUS_CFLAGS} -DDBUS_API_SUBJECT_TO_CHANGE)
option(splitlib "split library into dbus-lib-client, dbus-lib-generic, and dbus-lib-util, no installing possible" OFF)
if(splitlib AND MSVC)
# does not work with GCC/ld
set(DBUS_1 dbus-lib-client dbus-lib-generic dbus-lib-util)
message(STATUS "")
message(STATUS "dbus library is splitted into dbus-lib-client, dbus-lib-generic, and dbus-lib-util")
message(STATUS "installing is not possible")
message(STATUS "disable splitting: -Dsplitlib=0")
message(STATUS "")
else(splitlib AND MSVC)
message(STATUS "")
message(STATUS "for better code reading the dbus library could be splitted into three libraries:")
message(STATUS "dbus-lib-client, dbus-lib-generic, and dbus-lib-util (installing is then not possible)")
message(STATUS "enable splitting: -Dsplitlib=1")
message(STATUS "")
set(DBUS_1 dbus-1)
endif(splitlib AND MSVC)
########### subdirs ###############
add_subdirectory( dbus )

53
cmake/bus/CMakeLists.txt
View file

@ -1,6 +1,4 @@
include_directories(${CMAKE_SOURCE_DIR}/..)
include_directories( ${CMAKE_INCLUDE_PATH} )
project(bus)
add_definitions(-DDBUS_COMPILATION)
@ -45,8 +43,11 @@ set (BUS_SOURCES
${BUS_DIR}/bus.c
${BUS_DIR}/bus.h
${BUS_DIR}/config-parser.c
${BUS_DIR}/config-parser.h
${BUS_DIR}/connection.c
${BUS_DIR}/config-parser.h
${BUS_DIR}/config-parser-common.c
${BUS_DIR}/config-parser-common.h
# ${BUS_DIR}/config-parser-trivial.c
${BUS_DIR}/connection.c
${BUS_DIR}/connection.h
${BUS_DIR}/desktop-file.c
${BUS_DIR}/desktop-file.h
@ -74,30 +75,34 @@ set (BUS_SOURCES
${DIR_WATCH_SOURCE}
)
set (dbus_daemon_SOURCES
${BUS_SOURCES}
${BUS_DIR}/main.c
)
include_directories(${XML_INCLUDE_DIR})
SET (LIBS ${XML_LIBRARY})
add_executable(dbus-daemon${CMAKE_EXE_POSTFIX} ${dbus_daemon_SOURCES})
target_link_libraries(dbus-daemon${CMAKE_EXE_POSTFIX} dbus-1 ${LIBS})
install_targets(/bin dbus-daemon${CMAKE_EXE_POSTFIX} )
if(splitlib AND MSVC)
add_library(bus-lib STATIC ${BUS_SOURCES})
add_executable(dbus-daemon ${BUS_DIR}/main.c)
target_link_libraries(dbus-daemon ${DBUS_1} ${LIBS} bus-lib)
else(splitlib AND MSVC)
add_executable(dbus-daemon ${BUS_SOURCES} ${BUS_DIR}/main.c)
target_link_libraries(dbus-daemon ${DBUS_1} ${LIBS})
endif(splitlib AND MSVC)
set_target_properties(dbus-daemon PROPERTIES DEBUG_POSTFIX d)
install_targets(/bin dbus-daemon)
install_files(/etc FILES ${config_DATA})
if (DBUS_SERVICE)
set (dbus_service_SOURCES
${BUS_DIR}/bus-service-win.c
# TODO: add additional files
# TODO: add additional files
# ${BUS_DIR}/service-main.c
# ${BUS_SOURCES}
)
add_executable(dbus-service${CMAKE_EXE_POSTFIX} ${dbus_service_SOURCES} )
target_link_libraries(dbus-service${CMAKE_EXE_POSTFIX} dbus-1 ${LIBS})
install_targets(/bin dbus-service${CMAKE_EXE_POSTFIX} )
add_executable(dbus-service ${dbus_service_SOURCES} )
target_link_libraries(dbus-service ${DBUS_1} ${LIBS})
install_targets(/bin dbus-service )
set_target_properties(dbus-service PROPERTIES DEBUG_POSTFIX d)
endif (DBUS_SERVICE)
@ -115,14 +120,14 @@ endif (DBUS_SERVICE)
## even when not doing "make check"
#noinst_PROGRAMS=$(TESTS)
set (bus_test_SOURCES
${BUS_SOURCES}
${BUS_DIR}/test-main.c
)
if (DBUS_BUILD_TESTS)
add_executable(bus-test ${bus_test_SOURCES})
target_link_libraries(bus-test dbus-1 ${LIBS} )
if(splitlib AND MSVC)
add_executable(bus-test ${BUS_DIR}/test-main.c)
target_link_libraries(bus-test ${DBUS_1} ${LIBS} bus-lib)
else(splitlib AND MSVC)
add_executable(bus-test ${BUS_SOURCES} ${BUS_DIR}/test-main.c)
target_link_libraries(bus-test ${DBUS_1} ${LIBS})
endif(splitlib AND MSVC)
#install_targets(/bin bus-test)
add_test(bus-test ${EXECUTABLE_OUTPUT_PATH}/bus-test ${CMAKE_SOURCE_DIR}/../test/data)
endif (DBUS_BUILD_TESTS)

6
cmake/config.h.cmake
View file

@ -19,6 +19,12 @@
#cmakedefine PACKAGE "@PACKAGE@"
/* Version number of package */
#cmakedefine VERSION "@VERSION@"
#cmakedefine DBUS_MAJOR_VERSION ${VERSION_MAJOR}
#cmakedefine DBUS_MINOR_VERSION ${VERSION_MINOR}
#cmakedefine DBUS_MICRO_VERSION ${VERSION_RELEASE}
#cmakedefine DBUS_VERSION ((@VERSION_MAJOR@ << 16) | (@VERSION_MINOR@ << 8) | (@VERSION_RELEASE@))
#cmakedefine DBUS_VERSION_STRING "@VERSION@"
// test binaries
/* Full path to test file test/test-exit in builddir */
#define TEST_BUS_BINARY "@TEST_BUS_BINARY@"

66
cmake/dbus/CMakeLists.txt
View file

@ -1,8 +1,7 @@
project(dbus)
project(dbus-lib)
#INCLUDES=-I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) -DDBUS_COMPILATION
include_directories(${CMAKE_SOURCE_DIR}/..)
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 )
@ -24,6 +23,7 @@ set (dbusinclude_HEADERS
${DBUS_DIR}/dbus-server.h
${DBUS_DIR}/dbus-shared.h
${DBUS_DIR}/dbus-signature.h
${DBUS_DIR}/dbus-spawn.h
${DBUS_DIR}/dbus-threads.h
${DBUS_DIR}/dbus-types.h
dbus-arch-deps.h
@ -64,6 +64,8 @@ set (DBUS_LIB_SOURCES
# find a clean Windows implementation
# and move code to a *-win.c file
)
if(UNIX)
set (DBUS_LIB_SOURCES ${DBUS_LIB_SOURCES}
${DBUS_DIR}/dbus-transport-unix.c
@ -225,17 +227,57 @@ set(libdbus_HEADERS
${DBUS_UTIL_HEADERS}
)
if(MSVC)
add_library(dbus-1 STATIC ${libdbus_SOURCES} ${libdbus_HEADERS} )
project_source_group(${GROUP_CODE} libdbus_SOURCES libdbus_HEADERS)
else(MSVC)
add_library(dbus-1 ${libdbus_SOURCES} ${libdbus_HEADERS} )
endif(MSVC)
if(MSVC AND splitlib)
set(DBUS_LIB_TYPE STATIC)
elseif(MSVC AND splitlib)
set(DBUS_LIB_TYPE SHARED)
endif(MSVC AND splitlib)
target_link_libraries(dbus-1 ${LIBS} )
install_targets(/lib dbus-1 )
install_files(/include/dbus FILES ${dbusinclude_HEADERS})
if(splitlib AND MSVC)
# code for the client library and daemon/tests
add_library(dbus-lib-generic ${DBUS_LIB_TYPE} ${DBUS_SHARED_SOURCES} ${DBUS_SHARED_HEADERS})
# code only for daemon/tests
add_library(dbus-lib-util ${DBUS_LIB_TYPE} ${DBUS_UTIL_SOURCES} ${DBUS_UTIL_HEADERS})
# code for the client library
add_library(dbus-lib-client ${DBUS_LIB_TYPE} ${DBUS_LIB_SOURCES} ${DBUS_LIB_HEADERS})
target_link_libraries(dbus-lib-generic ${LIBS})
target_link_libraries(dbus-lib-util ${LIBS})
target_link_libraries(dbus-lib-client ${LIBS})
if(MSVC_IDE)
project_source_group(${GROUP_CODE} DBUS_LIB_SOURCES DBUS_LIB_HEADERS)
project_source_group(${GROUP_CODE} DBUS_SHARED_SOURCES DBUS_SHARED_HEADERS)
project_source_group(${GROUP_CODE} DBUS_UTIL_SOURCES DBUS_UTIL_SOURCES)
endif(MSVC_IDE)
else(splitlib AND MSVC)
# all code into one library
add_library(dbus-1 ${DBUS_LIB_TYPE} ${libdbus_SOURCES} ${libdbus_HEADERS} )
target_link_libraries(dbus-1 ${LIBS})
if(MSVC)
set(DEF_LIBRARY_NAME dbus-1.dll)
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/dbus-1.def.cmake" "${CMAKE_BINARY_DIR}/dbus-1.def")
set(DEF_LIBRARY_NAME dbus-1d.dll)
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/dbus-1.def.cmake" "${CMAKE_BINARY_DIR}/dbus-1d.def")
set_target_properties(dbus-1 PROPERTIES LINK_FLAGS_RELWITHDEBINFO /def:"${CMAKE_BINARY_DIR}/dbus-1.def")
set_target_properties(dbus-1 PROPERTIES LINK_FLAGS_RELEASE /def:"${CMAKE_BINARY_DIR}/dbus-1.def")
set_target_properties(dbus-1 PROPERTIES LINK_FLAGS_MINSIZEREL /def:"${CMAKE_BINARY_DIR}/dbus-1.def")
set_target_properties(dbus-1 PROPERTIES LINK_FLAGS_DEBUG /def:"${CMAKE_BINARY_DIR}/dbus-1d.def")
endif(MSVC)
if(MSVC_IDE)
project_source_group(${GROUP_CODE} libdbus_SOURCES libdbus_HEADERS)
endif(MSVC_IDE)
endif(splitlib AND MSVC)
if(NOT splitlib)
install_targets(/lib dbus-1 )
install_files(/include/dbus FILES ${dbusinclude_HEADERS})
endif(NOT splitlib)
#ADD_EXECUTABLE(dbus-example dbus-example.c)
#target_link_libraries(${CMAKE_SOURCE_DIR}/../dbus/dbus-example dbus-1)
@ -254,7 +296,7 @@ install_files(/include/dbus FILES ${dbusinclude_HEADERS})
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 ${LIBS})
target_link_libraries(dbus-test ${DBUS_1} ${LIBS})
add_test(dbus-test ${EXECUTABLE_OUTPUT_PATH}/dbus-test ${CMAKE_SOURCE_DIR}/../test/data)
#install_targets(/bin dbus-test)
ENDIF (DBUS_BUILD_TESTS)

880
cmake/dbus/dbus-1.def.cmake Executable file
View file

@ -0,0 +1,880 @@
/LIBRARY ${DEF_LIBRARY_NAME}
EXPORTS
_dbus_abort
_dbus_accept
_dbus_address_append_escaped
_dbus_address_test
_dbus_append_keyring_directory_for_credentials
_dbus_append_session_config_file
_dbus_append_system_config_file
_dbus_append_user_from_current_process
_dbus_atomic_dec
_dbus_atomic_inc
_dbus_auth_bytes_sent
_dbus_auth_client_new
_dbus_auth_decode_data
_dbus_auth_delete_unused_bytes
_dbus_auth_do_work
_dbus_auth_encode_data
_dbus_auth_get_buffer
_dbus_auth_get_bytes_to_send
_dbus_auth_get_guid_from_server
_dbus_auth_get_identity
_dbus_auth_get_unused_bytes
_dbus_auth_needs_decoding
_dbus_auth_needs_encoding
_dbus_auth_ref
_dbus_auth_return_buffer
_dbus_auth_script_run
_dbus_auth_server_new
_dbus_auth_set_context
_dbus_auth_set_credentials
_dbus_auth_set_mechanisms
_dbus_auth_test
_dbus_auth_unref
_dbus_babysitter_get_child_exited
_dbus_babysitter_get_child_exit_status
_dbus_babysitter_kill_child
_dbus_babysitter_ref
_dbus_babysitter_set_child_exit_error
_dbus_babysitter_set_watch_functions
_dbus_babysitter_unref
_dbus_become_daemon
_dbus_bus_notify_shared_connection_disconnected_unlocked
_dbus_change_identity
_dbus_change_to_daemon_user
_dbus_check_dir_is_private_to_user
_dbus_check_is_valid_bus_name
_dbus_check_is_valid_error_name
_dbus_check_is_valid_interface
_dbus_check_is_valid_member
_dbus_check_is_valid_path
_dbus_check_is_valid_signature
_dbus_close_socket
_dbus_command_for_pid
_dbus_concat_dir_and_file
_dbus_condvar_free
_dbus_condvar_free_at_location
_dbus_condvar_new
_dbus_condvar_new_at_location
_dbus_condvar_wait
_dbus_condvar_wait_timeout
_dbus_condvar_wake_all
_dbus_condvar_wake_one
_dbus_connect_tcp_socket
_dbus_connection_add_timeout_unlocked
_dbus_connection_add_watch_unlocked
_dbus_connection_block_pending_call
_dbus_connection_close_if_only_one_ref
_dbus_connection_close_possibly_shared
_dbus_connection_do_iteration_unlocked
_dbus_connection_get_message_to_send
_dbus_connection_handle_watch
_dbus_connection_has_messages_to_send_unlocked
_dbus_connection_lock
_dbus_connection_message_sent
_dbus_connection_new_for_transport
_dbus_connection_queue_received_message
_dbus_connection_queue_received_message_link
_dbus_connection_queue_synthesized_message_link
_dbus_connection_ref_unlocked
_dbus_connection_remove_pending_call
_dbus_connection_remove_timeout_unlocked
_dbus_connection_remove_watch_unlocked
_dbus_connection_send_and_unlock
_dbus_connection_test_get_locks
_dbus_connection_toggle_timeout_unlocked
_dbus_connection_toggle_watch_unlocked
_dbus_connection_unlock
_dbus_connection_unref_unlocked
_dbus_counter_adjust
_dbus_counter_get_value
_dbus_counter_new
_dbus_counter_ref
_dbus_counter_set_notify
_dbus_counter_unref
_dbus_create_directory
_dbus_create_file_exclusively
_dbus_credentials_add_credential
_dbus_credentials_add_credentials
_dbus_credentials_add_from_current_process
_dbus_credentials_add_from_user
_dbus_credentials_add_unix_pid
_dbus_credentials_add_unix_uid
_dbus_credentials_add_windows_sid
_dbus_credentials_are_anonymous
_dbus_credentials_are_empty
_dbus_credentials_are_superset
_dbus_credentials_clear
_dbus_credentials_copy
_dbus_credentials_get_unix_pid
_dbus_credentials_get_unix_uid
_dbus_credentials_get_windows_sid
_dbus_credentials_include
_dbus_credentials_new
_dbus_credentials_new_from_current_process
_dbus_credentials_ref
_dbus_credentials_same_user
_dbus_credentials_test
_dbus_credentials_unref
_dbus_current_generation DATA
_dbus_daemon_init
_dbus_daemon_release
_dbus_data_slot_allocator_alloc
_dbus_data_slot_allocator_free
_dbus_data_slot_allocator_init
_dbus_data_slot_list_clear
_dbus_data_slot_list_free
_dbus_data_slot_list_get
_dbus_data_slot_list_init
_dbus_data_slot_list_set
_dbus_data_slot_test
_dbus_decompose_path
_dbus_decrement_fail_alloc_counter
_dbus_delete_directory
_dbus_delete_file
_dbus_directory_close
_dbus_directory_get_next_file
_dbus_directory_open
_dbus_disable_mem_pools
_dbus_disable_sigpipe
_dbus_dup_string_array
_dbus_error_from_errno
_dbus_exit
_dbus_fd_set_close_on_exec
_dbus_file_close
_dbus_file_exists
_dbus_file_get_contents
_dbus_file_open
_dbus_file_read
_dbus_file_write
_dbus_first_type_in_signature
_dbus_first_type_in_signature_c_str
_dbus_flush_caches
_dbus_fstat
_dbus_full_duplex_pipe
_dbus_generate_pseudorandom_bytes_buffer
_dbus_generate_random_ascii
_dbus_generate_random_bytes
_dbus_generate_random_bytes_buffer
_dbus_generate_uuid
_dbus_get_autolaunch_address
_dbus_get_config_file_name
_dbus_get_current_time
_dbus_get_environment
_dbus_get_fail_alloc_counter
_dbus_get_fail_alloc_failures
_dbus_get_install_root
_dbus_get_is_errno_eagain_or_ewouldblock
_dbus_get_is_errno_eintr
_dbus_get_is_errno_enomem
_dbus_get_is_errno_nonzero
_dbus_get_local_machine_uuid_encoded
_dbus_get_malloc_blocks_outstanding
_dbus_get_oom_wait
_dbus_get_standard_session_servicedirs
_dbus_get_standard_system_servicedirs
_dbus_get_tmpdir
_dbus_getenv
_dbus_getgid
_dbus_getpid
_dbus_getsid
_dbus_getuid
_dbus_hash_iter_get_int_key
_dbus_hash_iter_get_string_key
_dbus_hash_iter_get_two_strings_key
_dbus_hash_iter_get_ulong_key
_dbus_hash_iter_get_value
_dbus_hash_iter_init
_dbus_hash_iter_lookup
_dbus_hash_iter_next
_dbus_hash_iter_remove_entry
_dbus_hash_iter_set_value
_dbus_hash_table_free_preallocated_entry
_dbus_hash_table_get_n_entries
_dbus_hash_table_insert_int
_dbus_hash_table_insert_pointer
_dbus_hash_table_insert_string
_dbus_hash_table_insert_string_preallocated
_dbus_hash_table_insert_two_strings
_dbus_hash_table_insert_ulong
_dbus_hash_table_lookup_int
_dbus_hash_table_lookup_pointer
_dbus_hash_table_lookup_string
_dbus_hash_table_lookup_two_strings
_dbus_hash_table_lookup_ulong
_dbus_hash_table_new
_dbus_hash_table_preallocate_entry
_dbus_hash_table_ref
_dbus_hash_table_remove_all
_dbus_hash_table_remove_int
_dbus_hash_table_remove_pointer
_dbus_hash_table_remove_string
_dbus_hash_table_remove_two_strings
_dbus_hash_table_remove_ulong
_dbus_hash_table_unref
_dbus_hash_test
_dbus_header_byteswap
_dbus_header_copy
_dbus_header_create
_dbus_header_delete_field
_dbus_header_field_to_string
_dbus_header_free
_dbus_header_get_field_basic
_dbus_header_get_field_raw
_dbus_header_get_flag
_dbus_header_get_message_type
_dbus_header_get_serial
_dbus_header_have_message_untrusted
_dbus_header_init
_dbus_header_load
_dbus_header_reinit
_dbus_header_set_field_basic
_dbus_header_set_serial
_dbus_header_toggle_flag
_dbus_header_update_lengths
_dbus_init_system_log
_dbus_is_valid_file
_dbus_is_verbose_real
_dbus_keyring_get_best_key
_dbus_keyring_get_hex_key
_dbus_keyring_is_for_credentials
_dbus_keyring_new_for_credentials
_dbus_keyring_ref
_dbus_keyring_test
_dbus_keyring_unref
_dbus_keyring_validate_context
_dbus_list_alloc_link
_dbus_list_append
_dbus_list_append_link
_dbus_list_clear
_dbus_list_copy
_dbus_list_find_last
_dbus_list_foreach
_dbus_list_free_link
_dbus_list_get_first
_dbus_list_get_first_link
_dbus_list_get_last
_dbus_list_get_last_link
_dbus_list_get_length
_dbus_list_insert_after
_dbus_list_insert_after_link
_dbus_list_insert_before
_dbus_list_insert_before_link
_dbus_list_length_is_one
_dbus_list_pop_first
_dbus_list_pop_first_link
_dbus_list_pop_last
_dbus_list_pop_last_link
_dbus_list_prepend
_dbus_list_prepend_link
_dbus_list_remove
_dbus_list_remove_last
_dbus_list_remove_link
_dbus_list_test
_dbus_list_unlink
_dbus_listen_tcp_socket
_dbus_lm_strerror
_dbus_lock_atomic DATA
_dbus_lock_bus DATA
_dbus_lock_bus_datas DATA
_dbus_lock_connection_slots DATA
_dbus_lock_list DATA
_dbus_lock_machine_uuid DATA
_dbus_lock_message_cache DATA
_dbus_lock_message_slots DATA
_dbus_lock_pending_call_slots DATA
_dbus_lock_server_slots DATA
_dbus_lock_shared_connections DATA
_dbus_lock_shutdown_funcs DATA
_dbus_lock_sid_atom_cache DATA
_dbus_lock_system_users DATA
_dbus_lock_win_fds DATA
_dbus_log_info
_dbus_log_security
_dbus_loop_add_timeout
_dbus_loop_add_watch
_dbus_loop_dispatch
_dbus_loop_iterate
_dbus_loop_new
_dbus_loop_queue_dispatch
_dbus_loop_quit
_dbus_loop_ref
_dbus_loop_remove_timeout
_dbus_loop_remove_watch
_dbus_loop_run
_dbus_loop_unref
_dbus_make_file_world_readable
_dbus_marshal_byteswap
_dbus_marshal_byteswap_test
_dbus_marshal_header_test
_dbus_marshal_read_basic
_dbus_marshal_read_fixed_multi
_dbus_marshal_read_uint32
_dbus_marshal_recursive_test
_dbus_marshal_set_basic
_dbus_marshal_set_uint32
_dbus_marshal_skip_array
_dbus_marshal_skip_basic
_dbus_marshal_test
_dbus_marshal_validate_test
_dbus_marshal_write_basic
_dbus_marshal_write_fixed_multi
_dbus_mem_pool_alloc
_dbus_mem_pool_dealloc
_dbus_mem_pool_free
_dbus_mem_pool_new
_dbus_mem_pool_test
_dbus_memdup
_dbus_memory_test
_dbus_message_add_size_counter
_dbus_message_add_size_counter_link
_dbus_message_data_free
_dbus_message_data_iter_get_and_next
_dbus_message_data_iter_init
_dbus_message_get_network_data
_dbus_message_iter_get_args_valist
_dbus_message_loader_get_buffer
_dbus_message_loader_get_is_corrupted
_dbus_message_loader_get_max_message_size
_dbus_message_loader_new
_dbus_message_loader_peek_message
_dbus_message_loader_pop_message
_dbus_message_loader_pop_message_link
_dbus_message_loader_putback_message_link
_dbus_message_loader_queue_messages
_dbus_message_loader_ref
_dbus_message_loader_return_buffer
_dbus_message_loader_set_max_message_size
_dbus_message_loader_unref
_dbus_message_lock
_dbus_message_remove_size_counter
_dbus_message_set_serial
_dbus_message_test
_dbus_misc_test
_dbus_mkdir
_dbus_mutex_free
_dbus_mutex_free_at_location
_dbus_mutex_lock
_dbus_mutex_new
_dbus_mutex_new_at_location
_dbus_mutex_unlock
_dbus_no_memory_message
_dbus_object_tree_dispatch_and_unlock
_dbus_object_tree_free_all_unlocked
_dbus_object_tree_get_user_data_unlocked
_dbus_object_tree_list_registered_and_unlock
_dbus_object_tree_new
_dbus_object_tree_ref
_dbus_object_tree_register
_dbus_object_tree_test
_dbus_object_tree_unref
_dbus_object_tree_unregister_and_unlock
_dbus_pack_uint32
_dbus_parse_unix_group_from_config
_dbus_parse_unix_user_from_config
_dbus_path_is_absolute
_dbus_pending_call_complete
_dbus_pending_call_get_completed_unlocked
_dbus_pending_call_get_connection_and_lock
_dbus_pending_call_get_connection_unlocked
_dbus_pending_call_get_reply_serial_unlocked
_dbus_pending_call_get_timeout_unlocked
_dbus_pending_call_is_timeout_added_unlocked
_dbus_pending_call_new_unlocked
_dbus_pending_call_queue_timeout_error_unlocked
_dbus_pending_call_ref_unlocked
_dbus_pending_call_set_data_unlocked
_dbus_pending_call_set_reply_serial_unlocked
_dbus_pending_call_set_reply_unlocked
_dbus_pending_call_set_timeout_added_unlocked
_dbus_pending_call_set_timeout_error_unlocked
_dbus_pending_call_test
_dbus_pending_call_unref_and_unlock
_dbus_pid_for_log
_dbus_pipe_close
_dbus_pipe_init
_dbus_pipe_init_stdout
_dbus_pipe_invalidate
_dbus_pipe_is_stdout_or_stderr
_dbus_pipe_is_valid
_dbus_pipe_write
_dbus_poll
_dbus_print_backtrace
_dbus_printf_string_upper_bound
_dbus_read_credentials_socket
_dbus_read_local_machine_uuid
_dbus_read_socket
_dbus_read_uuid_file
_dbus_real_assert
_dbus_real_assert_not_reached
_dbus_register_shutdown_func
_dbus_return_if_fail_warning_format DATA
_dbus_send_credentials_socket
_dbus_server_add_timeout
_dbus_server_add_watch
_dbus_server_debug_pipe_new
_dbus_server_finalize_base
_dbus_server_init_base
_dbus_server_listen_debug_pipe
_dbus_server_listen_platform_specific
_dbus_server_listen_socket
_dbus_server_new_for_socket
_dbus_server_new_for_tcp_socket
_dbus_server_ref_unlocked
_dbus_server_remove_timeout
_dbus_server_remove_watch
_dbus_server_socket_own_filename
_dbus_server_test
_dbus_server_toggle_timeout
_dbus_server_toggle_watch
_dbus_server_unref_unlocked
_dbus_set_bad_address
_dbus_set_errno_to_zero
_dbus_set_fail_alloc_counter
_dbus_set_fail_alloc_failures
_dbus_set_fd_nonblocking
_dbus_set_signal_handler
_dbus_setenv
_dbus_sha_compute
_dbus_sha_final
_dbus_sha_init
_dbus_sha_test
_dbus_sha_update
_dbus_shell_parse_argv
_dbus_shell_unquote
_dbus_signature_test
_dbus_sleep_milliseconds
_dbus_spawn_async_with_babysitter
_dbus_spawn_test
_dbus_split_paths_and_append
_dbus_stat
_dbus_strdup
_dbus_strerror
_dbus_strerror_from_errno
_dbus_string_align_length
_dbus_string_alloc_space
_dbus_string_append
_dbus_string_append_4_aligned
_dbus_string_append_8_aligned
_dbus_string_append_byte
_dbus_string_append_byte_as_hex
_dbus_string_append_double
_dbus_string_append_int
_dbus_string_append_len
_dbus_string_append_printf
_dbus_string_append_printf_valist
_dbus_string_append_uint
_dbus_string_append_unichar
_dbus_string_array_contains
_dbus_string_chop_white
_dbus_string_copy
_dbus_string_copy_data
_dbus_string_copy_data_len
_dbus_string_copy_len
_dbus_string_copy_to_buffer
_dbus_string_delete
_dbus_string_delete_first_word
_dbus_string_delete_leading_blanks
_dbus_string_ends_with_c_str
_dbus_string_equal
_dbus_string_equal_c_str
_dbus_string_equal_len
_dbus_string_equal_substring
_dbus_string_find
_dbus_string_find_blank
_dbus_string_find_byte_backward
_dbus_string_find_eol
_dbus_string_find_to
_dbus_string_free
_dbus_string_get_byte
_dbus_string_get_const_data
_dbus_string_get_const_data_len
_dbus_string_get_data
_dbus_string_get_data_len
_dbus_string_get_dirname
_dbus_string_get_length
_dbus_string_get_unichar
_dbus_string_hex_decode
_dbus_string_hex_encode
_dbus_string_init
_dbus_string_init_const
_dbus_string_init_const_len
_dbus_string_init_preallocated
_dbus_string_insert_2_aligned
_dbus_string_insert_4_aligned
_dbus_string_insert_8_aligned
_dbus_string_insert_alignment
_dbus_string_insert_byte
_dbus_string_insert_bytes
_dbus_string_lengthen
_dbus_string_lock
_dbus_string_move
_dbus_string_move_len
_dbus_string_parse_double
_dbus_string_parse_int
_dbus_string_parse_uint
_dbus_string_pop_line
_dbus_string_replace_len
_dbus_string_save_to_file
_dbus_string_set_byte
_dbus_string_set_length
_dbus_string_shorten
_dbus_string_skip_blank
_dbus_string_skip_white
_dbus_string_skip_white_reverse
_dbus_string_split_on_byte
_dbus_string_starts_with_c_str
_dbus_string_steal_data
_dbus_string_steal_data_len
_dbus_string_test
_dbus_string_validate_ascii
_dbus_string_validate_nul
_dbus_string_validate_utf8
_dbus_string_zero
_dbus_swap_array
_dbus_sysdeps_test
_dbus_test_oom_handling
_dbus_threads_init_debug
_dbus_threads_init_platform_specific
_dbus_timeout_list_add_timeout
_dbus_timeout_list_free
_dbus_timeout_list_new
_dbus_timeout_list_remove_timeout
_dbus_timeout_list_set_functions
_dbus_timeout_list_toggle_timeout
_dbus_timeout_new
_dbus_timeout_ref
_dbus_timeout_set_enabled
_dbus_timeout_set_interval
_dbus_timeout_unref
_dbus_transport_debug_pipe_new
_dbus_transport_disconnect
_dbus_transport_do_iteration
_dbus_transport_finalize_base
_dbus_transport_get_address
_dbus_transport_get_adt_audit_session_data
_dbus_transport_get_dispatch_status
_dbus_transport_get_is_anonymous
_dbus_transport_get_is_authenticated
_dbus_transport_get_is_connected
_dbus_transport_get_max_message_size
_dbus_transport_get_max_received_size
_dbus_transport_get_server_id
_dbus_transport_get_socket_fd
_dbus_transport_get_unix_process_id
_dbus_transport_get_unix_user
_dbus_transport_get_windows_user
_dbus_transport_handle_watch
_dbus_transport_init_base
_dbus_transport_new_for_socket
_dbus_transport_new_for_tcp_socket
_dbus_transport_open
_dbus_transport_open_debug_pipe
_dbus_transport_open_platform_specific
_dbus_transport_open_socket
_dbus_transport_queue_messages
_dbus_transport_ref
_dbus_transport_set_allow_anonymous
_dbus_transport_set_auth_mechanisms
_dbus_transport_set_connection
_dbus_transport_set_max_message_size
_dbus_transport_set_max_received_size
_dbus_transport_set_unix_user_function
_dbus_transport_set_windows_user_function
_dbus_transport_unref
_dbus_type_get_alignment
_dbus_type_is_valid
_dbus_type_reader_delete
_dbus_type_reader_equal_values
_dbus_type_reader_get_array_length
_dbus_type_reader_get_current_type
_dbus_type_reader_get_element_type
_dbus_type_reader_get_signature
_dbus_type_reader_get_value_pos
_dbus_type_reader_greater_than
_dbus_type_reader_has_next
_dbus_type_reader_init
_dbus_type_reader_init_types_only
_dbus_type_reader_next
_dbus_type_reader_read_basic
_dbus_type_reader_read_fixed_multi
_dbus_type_reader_read_raw
_dbus_type_reader_recurse
_dbus_type_reader_set_basic
_dbus_type_signature_next
_dbus_type_to_string
_dbus_type_writer_add_types
_dbus_type_writer_append_array
_dbus_type_writer_init
_dbus_type_writer_init_types_delayed
_dbus_type_writer_init_values_only
_dbus_type_writer_recurse
_dbus_type_writer_remove_types
_dbus_type_writer_set_enabled
_dbus_type_writer_unrecurse
_dbus_type_writer_write_basic
_dbus_type_writer_write_fixed_multi
_dbus_type_writer_write_reader
_dbus_type_writer_write_reader_partial
_dbus_unix_groups_from_uid
_dbus_unix_user_is_at_console
_dbus_unix_user_is_process_owner
_dbus_unpack_uint16
_dbus_unpack_uint32
_dbus_user_at_console
_dbus_uuid_encode
_dbus_validate_body_with_reason
_dbus_validate_bus_name
_dbus_validate_error_name
_dbus_validate_interface
_dbus_validate_member
_dbus_validate_path
_dbus_validate_signature
_dbus_validate_signature_with_reason
_dbus_verbose_bytes
_dbus_verbose_bytes_of_string
_dbus_verbose_real
_dbus_verbose_reset_real
_dbus_verify_daemon_user
_dbus_wait_for_memory
_dbus_warn
_dbus_warn_check_failed
_dbus_watch_invalidate
_dbus_watch_list_add_watch
_dbus_watch_list_free
_dbus_watch_list_new
_dbus_watch_list_remove_watch
_dbus_watch_list_set_functions
_dbus_watch_list_toggle_watch
_dbus_watch_new
_dbus_watch_ref
_dbus_watch_sanitize_condition
_dbus_watch_set_handler
_dbus_watch_unref
_dbus_win_account_to_sid
_dbus_win_set_error_from_win_error
_dbus_win_startup_winsock
_dbus_win_utf16_to_utf8
_dbus_win_utf8_to_utf16
_dbus_win_warn_win_error
_dbus_windows_user_is_process_owner
_dbus_write_pid_to_file_and_pipe
_dbus_write_socket
_dbus_write_socket_two
dbus_address_entries_free
dbus_address_entry_get_method
dbus_address_entry_get_value
dbus_address_escape_value
dbus_address_unescape_value
dbus_bus_add_match
dbus_bus_get
dbus_bus_get_id
dbus_bus_get_private
dbus_bus_get_unique_name
dbus_bus_get_unix_user
dbus_bus_name_has_owner
dbus_bus_register
dbus_bus_release_name
dbus_bus_remove_match
dbus_bus_request_name
dbus_bus_set_unique_name
dbus_bus_start_service_by_name
dbus_connection_add_filter
dbus_connection_allocate_data_slot
dbus_connection_borrow_message
dbus_connection_close
dbus_connection_dispatch
dbus_connection_flush
dbus_connection_free_data_slot
dbus_connection_free_preallocated_send
dbus_connection_get_adt_audit_session_data
dbus_connection_get_data
dbus_connection_get_dispatch_status
dbus_connection_get_is_anonymous
dbus_connection_get_is_authenticated
dbus_connection_get_is_connected
dbus_connection_get_max_message_size
dbus_connection_get_max_received_size
dbus_connection_get_object_path_data
dbus_connection_get_outgoing_size
dbus_connection_get_server_id
dbus_connection_get_socket
dbus_connection_get_unix_fd
dbus_connection_get_unix_process_id
dbus_connection_get_unix_user
dbus_connection_get_windows_user
dbus_connection_has_messages_to_send
dbus_connection_list_registered
dbus_connection_open
dbus_connection_open_private
dbus_connection_pop_message
dbus_connection_preallocate_send
dbus_connection_read_write
dbus_connection_read_write_dispatch
dbus_connection_ref
dbus_connection_register_fallback
dbus_connection_register_object_path
dbus_connection_remove_filter
dbus_connection_return_message
dbus_connection_send
dbus_connection_send_preallocated
dbus_connection_send_with_reply
dbus_connection_send_with_reply_and_block
dbus_connection_set_allow_anonymous
dbus_connection_set_change_sigpipe
dbus_connection_set_data
dbus_connection_set_dispatch_status_function
dbus_connection_set_exit_on_disconnect
dbus_connection_set_max_message_size
dbus_connection_set_max_received_size
dbus_connection_set_route_peer_messages
dbus_connection_set_timeout_functions
dbus_connection_set_unix_user_function
dbus_connection_set_wakeup_main_function
dbus_connection_set_watch_functions
dbus_connection_set_windows_user_function
dbus_connection_steal_borrowed_message
dbus_connection_unref
dbus_connection_unregister_object_path
dbus_error_free
dbus_error_has_name
dbus_error_init
dbus_error_is_set
dbus_free
dbus_free_string_array
dbus_get_local_machine_id
dbus_internal_do_not_use_foreach_message_file
dbus_internal_do_not_use_generate_bodies
dbus_internal_do_not_use_load_message_file
dbus_internal_do_not_use_run_tests
dbus_internal_do_not_use_try_message_data
dbus_internal_do_not_use_try_message_file
dbus_malloc
dbus_malloc0
dbus_message_allocate_data_slot
dbus_message_append_args
dbus_message_append_args_valist
dbus_message_copy
dbus_message_demarshal
dbus_message_free_data_slot
dbus_message_get_args
dbus_message_get_args_valist
dbus_message_get_auto_start
dbus_message_get_data
dbus_message_get_destination
dbus_message_get_error_name
dbus_message_get_interface
dbus_message_get_member
dbus_message_get_no_reply
dbus_message_get_path
dbus_message_get_path_decomposed
dbus_message_get_reply_serial
dbus_message_get_sender
dbus_message_get_serial
dbus_message_get_signature
dbus_message_get_type
dbus_message_has_destination
dbus_message_has_interface
dbus_message_has_member
dbus_message_has_path
dbus_message_has_sender
dbus_message_has_signature
dbus_message_is_error
dbus_message_is_method_call
dbus_message_is_signal
dbus_message_iter_append_basic
dbus_message_iter_append_fixed_array
dbus_message_iter_close_container
dbus_message_iter_get_arg_type
dbus_message_iter_get_array_len
dbus_message_iter_get_basic
dbus_message_iter_get_element_type
dbus_message_iter_get_fixed_array
dbus_message_iter_get_signature
dbus_message_iter_has_next
dbus_message_iter_init
dbus_message_iter_init_append
dbus_message_iter_next
dbus_message_iter_open_container
dbus_message_iter_recurse
dbus_message_marshal
dbus_message_new
dbus_message_new_error
dbus_message_new_error_printf
dbus_message_new_method_call
dbus_message_new_method_return
dbus_message_new_signal
dbus_message_ref
dbus_message_set_auto_start
dbus_message_set_data
dbus_message_set_destination
dbus_message_set_error_name
dbus_message_set_interface
dbus_message_set_member
dbus_message_set_no_reply
dbus_message_set_path
dbus_message_set_reply_serial
dbus_message_set_sender
dbus_message_type_from_string
dbus_message_type_to_string
dbus_message_unref
dbus_move_error
dbus_parse_address
dbus_pending_call_allocate_data_slot
dbus_pending_call_block
dbus_pending_call_cancel
dbus_pending_call_free_data_slot
dbus_pending_call_get_completed
dbus_pending_call_get_data
dbus_pending_call_ref
dbus_pending_call_set_data
dbus_pending_call_set_notify
dbus_pending_call_steal_reply
dbus_pending_call_unref
dbus_realloc
dbus_server_allocate_data_slot
dbus_server_disconnect
dbus_server_free_data_slot
dbus_server_get_address
dbus_server_get_data
dbus_server_get_id
dbus_server_get_is_connected
dbus_server_listen
dbus_server_ref
dbus_server_set_auth_mechanisms
dbus_server_set_data
dbus_server_set_new_connection_function
dbus_server_set_timeout_functions
dbus_server_set_watch_functions
dbus_server_unref
dbus_set_error
dbus_set_error_const
dbus_set_error_from_message
dbus_shutdown
dbus_signature_iter_get_current_type
dbus_signature_iter_get_element_type
dbus_signature_iter_get_signature
dbus_signature_iter_init
dbus_signature_iter_next
dbus_signature_iter_recurse
dbus_signature_validate
dbus_signature_validate_single
dbus_threads_init
dbus_threads_init_default
dbus_timeout_get_data
dbus_timeout_get_enabled
dbus_timeout_get_interval
dbus_timeout_handle
dbus_timeout_set_data
dbus_type_is_basic
dbus_type_is_container
dbus_type_is_fixed
dbus_watch_get_data
dbus_watch_get_enabled
dbus_watch_get_fd
dbus_watch_get_flags
dbus_watch_get_socket
dbus_watch_get_unix_fd
dbus_watch_handle
dbus_watch_set_data

55
cmake/test/CMakeLists.txt
View file

@ -1,3 +1,4 @@
project(test)
#if HAVE_GLIB
# GLIB_SUBDIR=glib
@ -16,9 +17,6 @@ add_subdirectory( name-test )
#INCLUDES=-I$(top_srcdir) $(DBUS_test-CFLAGS)
include_directories( ${CMAKE_SOURCE_DIR}/.. )
include_directories( ${CMAKE_INCLUDE_PATH} )
if (WIN32)
add_definitions(-Dsleep=_sleep)
endif (WIN32)
@ -89,7 +87,7 @@ set (decode_gcov_SOURCES
)
add_executable(test-service ${test-service_SOURCES})
target_link_libraries(test-service dbus-1)
target_link_libraries(test-service ${DBUS_1})
#install_targets(/bin test-service)
# (rh) does not work at now
@ -98,63 +96,68 @@ ADD_TEST(test-service ${EXECUTABLE_OUTPUT_PATH}/test-service${EXT})
add_executable(test-names ${test-names_SOURCES})
target_link_libraries(test-names dbus-1)
target_link_libraries(test-names ${DBUS_1})
#install_targets(/bin test-names)
ADD_TEST(test-names ${EXECUTABLE_OUTPUT_PATH}/test-names${EXT})
add_executable(test-shell ${test-shell_SOURCES})
target_link_libraries(test-shell dbus-1)
target_link_libraries(test-shell ${DBUS_1})
#install_targets(/bin test-shell)
ADD_TEST(test-shell ${EXECUTABLE_OUTPUT_PATH}/test-shell${EXT})
add_executable(test-shell-service ${test-shell_SOURCES})
target_link_libraries(test-shell-service dbus-1)
target_link_libraries(test-shell-service ${DBUS_1})
#install_targets(/bin test-shell-service)
ADD_TEST(test-shell-service ${EXECUTABLE_OUTPUT_PATH}/test-shell-service${EXT})
add_executable(test-spawn ${test-spawn_SOURCES})
target_link_libraries(test-spawn dbus-1)
target_link_libraries(test-spawn ${DBUS_1})
# (rh) does not work now
#ADD_TEST(test-spawn ${EXECUTABLE_OUTPUT_PATH}/test-spawn${EXT})
add_executable(test-exit ${test-exit_SOURCES})
target_link_libraries(test-exit dbus-1)
target_link_libraries(test-exit ${DBUS_1})
#install_targets(/bin test-exit)
ADD_TEST(test-exit ${EXECUTABLE_OUTPUT_PATH}/test-exit${EXT})
add_executable(test-segfault ${test-segfault_SOURCES})
target_link_libraries(test-segfault dbus-1)
target_link_libraries(test-segfault ${DBUS_1})
#install_targets(/bin test-segfault)
ADD_TEST(test-segfault ${EXECUTABLE_OUTPUT_PATH}/test-segfault${EXT})
add_executable(test-sleep-forever ${test-sleep-forever_SOURCES})
target_link_libraries(test-sleep-forever dbus-1)
target_link_libraries(test-sleep-forever ${DBUS_1})
# (rh) don't know for what this test is good
#ADD_TEST(test-sleep-forever ${EXECUTABLE_OUTPUT_PATH}/test-sleep-forever${EXT})
#add_executable(decode-gcov ${decode_gcov_SOURCES})
#target_link_libraries(decode-gcov dbus-1)
#target_link_libraries(decode-gcov ${DBUS_1})
#EXTRA_DIST=
#
### keep these in creation order, i.e. uppermost dirs first
set (TESTDIRS
test/data
test/data/valid-messages
test/data/invalid-messages
test/data/incomplete-messages
test/data/auth
test/data/sha-1
test/data/valid-config-files
test/data/valid-config-files/basic.d
test/data/valid-config-files/system.d
test/data/valid-service-files
test/data/invalid-config-files
test/data/equiv-config-files
test/data/equiv-config-files/basic
test/data/equiv-config-files/basic/basic.d
test/data/equiv-config-files/entities
test/data/auth
test/data/equiv-config-files
test/data/equiv-config-files/basic
test/data/equiv-config-files/basic/basic.d
test/data/equiv-config-files/entities
test/data/equiv-config-files/entities/basic.d
test/data/incomplete-messages
test/data/invalid-config-files
test/data/invalid-config-files-system
test/data/invalid-messages
test/data/invalid-service-files-system
test/data/sha-1
test/data/valid-config-files
test/data/valid-config-files/basic.d
test/data/valid-config-files/system.d
test/data/valid-config-files-system
test/data/valid-introspection-files
test/data/valid-messages
test/data/valid-service-files
test/data/valid-service-files-system
)
set (CONFIG_VERBOSE 0)

8
cmake/test/name-test/CMakeLists.txt
View file

@ -2,23 +2,21 @@ if (DBUS_BUILD_TESTS)
set (NAMEtest-DIR ../../../test/name-test)
include_directories( ${CMAKE_SOURCE_DIR}/.. )
include_directories( ${CMAKE_INCLUDE_PATH} )
add_definitions(-DDBUS_COMPILATION)
# there is also a test-names executable, don't know if this is the same
add_executable(test-names1 ${NAMEtest-DIR}/test-names.c)
target_link_libraries(test-names1 dbus-1)
target_link_libraries(test-names1 ${DBUS_1})
#install_targets(/bin test-names1)
ADD_TEST(test-names ${EXECUTABLE_OUTPUT_PATH}/test-names1)
add_executable(test-pending-call-dispatch ${NAMEtest-DIR}/test-pending-call-dispatch.c)
target_link_libraries(test-pending-call-dispatch dbus-1)
target_link_libraries(test-pending-call-dispatch ${DBUS_1})
#install_targets(/bin test-pending-call-dispatch)
ADD_TEST(test-pending-call-dispatch ${EXECUTABLE_OUTPUT_PATH}/test-pending_call-dispatch)
add_executable(test-thread-init ${NAMEtest-DIR}/test-threads-init.c)
target_link_libraries(test-thread-init dbus-1)
target_link_libraries(test-thread-init ${DBUS_1})
#install_targets(/bin test-thread-init)
ADD_TEST(test-names ${EXECUTABLE_OUTPUT_PATH}/test-thread-init)

61
cmake/tools/CMakeLists.txt
View file

@ -1,30 +1,4 @@
include_directories(${CMAKE_SOURCE_DIR}/..)
#nodist_libdbus_glib_HEADERS = dbus-glib-bindings.h
#libdbus_glibdir = $(includedir)/dbus-1.0/dbus
#dbus-glib-bindings.h: dbus-bus-introspect.xml $(top_builddir)/glib/dbus-binding-tool$(EXEEXT)
# $(top_builddir)/glib/dbus-binding-tool --mode=glib-client --output=dbus-glib-bindings.h dbus-bus-introspect.xml
#BUILT_SOURCES = dbus-glib-bindings.h dbus-bus-introspect.xml
#else
#GLIB_TOOLS=
#endif
#if HAVE_GTK
#GTK_TOOLS=dbus-viewer
#else
#GTK_TOOLS=
#endif
#if HAVE_GLIB
#dbus-bus-introspect.xml: $(top_builddir)/bus/dbus-daemon$(EXEEXT) dbus-launch$(EXEEXT) dbus-send$(EXEEXT) $(top_builddir)/bus/dbus-daemon$(EXEEXT) Makefile
# DBUS_TOP_BUILDDIR=$(top_builddir) $(srcdir)/run-with-tmp-session-bus.sh ./dbus-send --print-reply=literal --dest=org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus.Introspectable.Introspect > dbus-bus-introspect.xml.tmp && mv dbus-bus-introspect.xml.tmp dbus-bus-introspect.xml
#endif
#bin_PROGRAMS=dbus-send $(GLIB_TOOLS) dbus-launch dbus-cleanup-sockets $(GTK_TOOLS)
project(tools)
set (dbus_send_SOURCES
../../tools/dbus-print-message.c
@ -60,29 +34,16 @@ set (dbus_viewer_SOURCES
../../tools/dbus-viewer.c
)
add_executable(dbus-send${CMAKE_EXE_POSTFIX} ${dbus_send_SOURCES})
target_link_libraries(dbus-send${CMAKE_EXE_POSTFIX} dbus-1)
install_targets(/bin dbus-send${CMAKE_EXE_POSTFIX} )
add_executable(dbus-send ${dbus_send_SOURCES})
target_link_libraries(dbus-send ${DBUS_1})
install_targets(/bin dbus-send )
# glib required
#add_executable(dbus_launch${CMAKE_EXE_POSTFIX} ${dbus_launch_SOURCES})
add_executable(dbus-launch ${dbus_launch_SOURCES})
target_link_libraries(dbus-launch )
install_targets(/bin dbus-launch )
add_executable(dbus-launch${CMAKE_EXE_POSTFIX} ${dbus_launch_SOURCES})
target_link_libraries(dbus-launch${CMAKE_EXE_POSTFIX} )
install_targets(/bin dbus-launch${CMAKE_EXE_POSTFIX} )
add_executable(dbus-monitor ${dbus_monitor_SOURCES})
target_link_libraries(dbus-monitor ${DBUS_1})
install_targets(/bin dbus-monitor )
add_executable(dbus-monitor${CMAKE_EXE_POSTFIX} ${dbus_monitor_SOURCES})
target_link_libraries(dbus-monitor${CMAKE_EXE_POSTFIX} dbus-1)
install_targets(/bin dbus-monitor${CMAKE_EXE_POSTFIX} )
#dbus_send_LDADD= $(top_builddir)/dbus/libdbus-1.la
#dbus_monitor_LDADD= $(top_builddir)/glib/libdbus-glib-1.la
#dbus_launch_LDADD= $(DBUS_X_LIBS)
#dbus_viewer_LDADD= $(top_builddir)/glib/libdbus-gtool.la $(DBUS_GTK_THREADS_LIBS) $(DBUS_GLIB_TOOL_LIBS)
#man_MANS = dbus-send.1 dbus-monitor.1 dbus-launch.1 dbus-cleanup-sockets.1
#EXTRA_DIST = $(man_MANS) run-with-tmp-session-bus.sh
#CLEANFILES =
# run-with-tmp-session-bus.conf
# dbus-bus-introspect.xml
# dbus-glib-bindings.h
set_target_properties(dbus-send dbus-launch dbus-monitor PROPERTIES DEBUG_POSTFIX d)