Attachment 106415 Details for Bug 83583 – Build test-bus-system with cmake on non win32 platforms

[patch] Build test-bus-system with cmake on non win32 platforms

0001-Build-test-bus-system-with-cmake-on-non-win32-platfo.patch (text/plain), 1.50 KB, created by Ralf Habacker on 2014-09-17 08:11:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ralf Habacker

Created: 2014-09-17 08:11:56 UTC

Size: 1.50 KB

patch

obsolete

>From e0b5ac71e792f7a34727e68ae83124a726498d5a Mon Sep 17 00:00:00 2001
>From: Ralf Habacker <ralf.habacker@freenet.de>
>Date: Wed, 17 Sep 2014 10:09:33 +0200
>Subject: [PATCH] Build test-bus-system with cmake on non win32 platforms.
>
>---
> cmake/bus/CMakeLists.txt | 16 +++++++++++++++-
> 1 file changed, 15 insertions(+), 1 deletion(-)
>
>diff --git a/cmake/bus/CMakeLists.txt b/cmake/bus/CMakeLists.txt
>index a2a4b36..2ff6c9b 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)
>-- 
>1.8.4.5
>

Actions: View | Splinter Review

Attachments on bug 83583: 105857 | 106149 | 106186 | 106257 | 106259 | 106261 | 106415

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.