diff options
| author | Ralf Habacker <ralf.habacker@freenet.de> | 2014-09-17 10:09:33 +0200 |
|---|---|---|
| committer | Ralf Habacker <ralf.habacker@freenet.de> | 2014-09-18 02:41:45 +0200 |
| commit | 96646adbe9678cbb69b8c314b3c4433d6207277b (patch) | |
| tree | d24ece15ad71cb1c4d5bc71070801cc8c8ba8a92 | |
| parent | c1b92aceee6167f631ff8731fcc917f816d5572a (diff) | |
Build test-bus-system with cmake on non win32 platforms.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=83583
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
| -rw-r--r-- | cmake/bus/CMakeLists.txt | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/cmake/bus/CMakeLists.txt b/cmake/bus/CMakeLists.txt index a2a4b364..2ff6c9bc 100644 --- a/cmake/bus/CMakeLists.txt +++ b/cmake/bus/CMakeLists.txt @@ -77,7 +77,11 @@ if(DBUS_ENABLE_STATS) ) endif(DBUS_ENABLE_STATS) -include_directories(${XML_INCLUDE_DIR}) +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_SOURCE_DIR}/.. + ${XML_INCLUDE_DIR} +) add_executable(dbus-daemon ${BUS_SOURCES} ${BUS_DIR}/main.c) target_link_libraries(dbus-daemon ${DBUS_INTERNAL_LIBRARIES} ${XML_LIBRARY}) @@ -114,6 +118,16 @@ if (DBUS_ENABLE_EMBEDDED_TESTS) set(SOURCES ${BUS_SOURCES} ${BUS_DIR}/test-main.c) add_test_executable(test-bus "${SOURCES}" ${DBUS_INTERNAL_LIBRARIES} ${XML_LIBRARY}) set_target_properties(test-bus PROPERTIES COMPILE_FLAGS ${DBUS_INTERNAL_CLIENT_DEFINITIONS}) + if (NOT DBUS_WIN32) + set(test_bus_system_SOURCES + ${XML_SOURCES} + ${BUS_DIR}/config-parser-common.c + ${BUS_DIR}/config-parser-trivial.c + ${BUS_DIR}/utils.c + ${BUS_DIR}/test-system.c + ) + add_test_executable(test-bus-system "${test_bus_system_SOURCES}" ${DBUS_INTERNAL_LIBRARIES} ${XML_LIBRARY} ${DBUS_BUS_LIBS}) + endif() endif (DBUS_ENABLE_EMBEDDED_TESTS) if(MSVC) |