Commit graph

159 commits

Author SHA1 Message Date
Ralf Habacker
7aed4eb923 refactored cmake version extracting from configure.ac 2011-10-29 00:25:18 +02:00
Ralf Habacker
ff3f4860ef Use dbus/dbus-arch-deps.h.in as source for cmake too
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41033
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2011-09-23 15:38:12 +02:00
Ralf Habacker
1767840160 Added cmake 'help-options' target to print out all available configure options
cherry-picked 5a0c5663eb
2011-09-22 20:32:42 +02:00
Ralf Habacker
37a81fc981 fixed cmake error: doc says CACHE needs type *and* doc string
cherry-picked aba867f242
2011-09-22 20:27:59 +02:00
Ralf Habacker
2f3403c37b Limit batch file creating to windows
cherry-picked 84b03cae58
2011-09-22 20:27:58 +02:00
Ralf Habacker
b49e278667 Fixed cmake buildsystem - option command only supports boolean values
Conflicts:

	cmake/CMakeLists.txt

cherry picked 4ee7b07b20 from master
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2011-09-22 20:03:48 +02:00
Ralf Habacker
e41d163083 cmake fix: generate build timestamp
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41029
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2011-09-22 19:55:13 +02:00
Ralf Habacker
692baa9d6a Simplified cmake xml parser dependencies.
Find either expat or libxml2 xml parser libraries, depending on -DDBUS_USE_EXPAT=ON|OFF

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41027
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2011-09-22 19:33:32 +02:00
Ralf Habacker
70b0ffd501 cmake fix: install version string
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=40905
2011-09-20 19:34:38 +02:00
Ralf Habacker
4a3e5b0af4 Fix compilation on MSVC, which doesn't understand "inline" with its C99 meaning.
This fix is limited to msvc compilers only.

Reviewed-by:Simon McVittie <simon.mcvittie@collabora.co.uk>
2011-08-13 22:08:26 +02:00
Ralf Habacker
b0b5f9b134 Win32 compile fix.
msvc compilers define 'inline' only for c++ code, so wrap it
with a platform independent DBUS_INLINE define in cmake
generated config.h.
2011-08-05 23:01:10 +02:00
Simon McVittie
c1bcd2269c cmake: always enable GNU and recent-POSIX extensions, like autoconf does
If the C library is (e)glibc, this allows use of POSIX, BSD, SVID, GNU,
etc., extensions to ISO C, regardless of using -ansi or not.

Not doing this broke the cmake build on Linux since commit 18b08180,
which added AC_USE_SYSTEM_EXTENSIONS to configure.ac (and removed
_GNU_SOURCE from files that use it) without also updating the cmake
build system. SO_PEERCRED is defined unconditionally, but struct ucred
is considered to be a GNU extension, so can't be used under _GNU_SOURCE.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=29228
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
2011-08-05 14:17:51 +01:00
Ralf Habacker
110e06a78c Added DBUS_ENABLE_STATS option to cmake buildsystem to keep in sync with autotools. 2011-07-08 10:55:46 +02:00
Ralf Habacker
836b84a05a Collected cmake doc into README.cmake. 2011-07-08 10:55:03 +02:00
Simon McVittie
90f36efbc3 Add support for building "modular" tests, which require GLib and dbus-glib
For the moment, the CMake build system only knows about the existing
"embedded tests"; make it define both symbols, though.

We use GLib because it has GTester (and life's too short to write yet another
JUnit clone), and dbus-glib for the main-loop integration only (see
fd.o #31515 for thoughts on incorporating just those two functions in a
separate library in the dbus tarball).

I'm not using DBusLoop for the main loop because I specifically don't
want to use non-public API or ABI of libdbus in the modular tests. If we make
sure they work against a shared libdbus, we can use them to test the
installed system, with "make installcheck".

Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=34570
2011-06-10 18:31:31 +01:00
Simon McVittie
cea055514a Check for X even if X11 autolaunching is disabled
DBUS_ENABLE_X11_AUTOLAUNCH obviously requires DBUS_BUILD_X11. However,
the converse is not true.

If DBUS_BUILD_X11 is defined, dbus-launch will be able to connect to
the X server to determine when the session ends; most distributors will
want this, but it can be disabled with the standard Autoconf option
--without-x.

If DBUS_ENABLE_X11_AUTOLAUNCH is *also* defined, dbus-launch and libdbus
will be willing to perform autolaunch. Again, most distributors will want
this, but it can be disabled with --disable-x11-autolaunch.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=19997
Reviewed-by: Colin Walters <walters@verbum.org>
2011-05-25 17:38:44 +01:00
Ralf Habacker
0c47090d0e Definition is obsolate with commit e0fc90bdf2 2011-05-25 16:08:19 +01:00
Ralf Habacker
45de11f029 To avoid double dbus version definitions take values from configure.ac. 2011-05-25 16:08:16 +01:00
Simon McVittie
f04e52a2e5 Allow X11 autolaunch to be disabled even if the headers/libraries are there
In an embedded system where the D-Bus session is a core part of the
environment, like Maemo, accidentally auto-launching a second session bus
(for instance for a concurrent ssh session) is a bad idea - it can lead
to a "split brain" situation where half the applications in the GUI are
using a different bus. In these controlled environments, it'd be useful
to prevent autolaunch from ever happening.

(As a side benefit, the changes to configure.in also mean that packagers
can explicitly --enable-x11-autolaunch, to make sure that failure to find
X will make compilation fail cleanly.)

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=19997
Bug-NB: NB#219964
2011-02-24 18:58:18 +00:00
Simon McVittie
9a97f82079 Import compiler.m4 and lcov.am from telepathy-glib, and use them to replace gcov
Reviewed-by: Colin Walters <walters@verbum.org>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=10887
2011-02-17 17:07:12 +00:00
Simon McVittie
f8d0012ab1 Remove references to dbus-md5, which hasn't been used for at least 8 years
Reviewed-by: Colin Walters <walters@verbum.org>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=34292
2011-02-17 16:16:12 +00:00
Simon McVittie
297919ae61 cmake/cross-compile.sh: use mktemp(1) to avoid a symlink attack in /tmp 2011-01-05 19:10:43 +00:00
Ralf Habacker
02d973686a Use absolute session service dir path in bus-test on windows. 2010-12-29 14:43:24 +01:00
Ralf Habacker
79026cee36 Keep in sync with autotools. 2010-12-29 14:42:45 +01:00
Ralf Habacker
34ef61645c Keep in sync with automake. 2010-12-21 08:24:00 +01:00
Ralf Habacker
1d2f5607b4 Fix bus-test failure with cmake on unix.
SHA1 connection tests needs an non debug-pipe transport for the activation bus.
2010-12-07 22:51:00 +01:00
Ralf Habacker
37619035de Keep in sync with automake. 2010-12-04 23:05:56 +01:00
Ralf Habacker
a8810a7940 Service dir related bug fix on windows.
The code for accessing services requires absolute pathes, which are based
on DBUS_DATADIR. DBUS_DATADIR on windows is defined relative. This patch
makes sure that those pathes are absolute.
2010-10-29 11:55:27 +02:00
Ralf Habacker
30213f4b7d Cleaned up windows related README's. 2010-10-12 14:45:12 +02:00
Ralf Habacker
d0da9218de Fixed reference to cmake configure options. 2010-10-12 13:50:10 +02:00
Ralf Habacker
1332dba1a2 keep version in sync with automake 2010-10-12 00:20:21 +02:00
Ralf Habacker
f6a67597dc Extended autolaunch protocol with scope attribute. 2010-09-27 21:53:32 +02:00
Ralf Habacker
80f851416f Unix compile fix. 2010-09-08 09:13:42 +02:00
Will Thompson
a44d08711c Revert "Bug 28460 - Refactored dbus configuration access."
This reverts commit 6f9077ee87, which
broke the build on Unix (see previous patch) and introduced a bunch of
warnings.
2010-06-17 15:14:22 +01:00
Ralf Habacker
6f9077ee87 Bug 28460 - Refactored dbus configuration access.
Libdbus uses several config variables. On unix these settings are read from
environment variables by using _dbus_getenv.

On other platforms like wince there are no environment variables available and
_dbus_getenv needs an emulation for those plattforms (see
dbus/dbus-sysdeps-wince-glue.c)

To cleanup this emulation the appended patch adds a config api by adding
_dbus_config_... functions.

Also having all client config related functions listed in one header file
provides a good overview about which config attributes  are available.

The default implementation retrieves the config values from environment
variables. For other os this could be easily extended or replaced by.
2010-06-14 18:27:04 +02:00
Ralf Habacker
8cd61621ce Keep cmake default session and system bus address setup in sync with autotools. 2010-06-11 10:48:10 +02:00
Ralf Habacker
e66dd0eeb5 Keep in sync with autotools. 2010-06-07 14:23:44 +02:00
Ralf Habacker
4d3fefc7f7 Keep in sync with autotools. 2010-06-07 13:59:21 +02:00
Romain Pokrzywka
3222b64d4a fix {u}intptr_t usage on wince with msvc 2010-05-05 07:57:28 +02:00
Fridrich Štrba
c096c5cb9a Don't truncate pointers on Windows x64 platform 2010-05-03 10:48:38 +02:00
Ralf Habacker
04ddf2e3aa Merge branch 'master' of ssh://git.freedesktop.org/git/dbus/dbus 2010-04-27 11:22:32 +02:00
Ralf Habacker
e50c57c787 Minor name spelling fix. 2010-04-27 11:19:56 +02:00
Ralf Habacker
dfd525d602 Added cmake cross compile wrapper. 2010-04-22 11:51:23 +02:00
Ralf Habacker
14cc116254 Removed obsolate file. 2010-04-16 08:04:26 +02:00
Marcus Brinkmann
abb81eb446 Fix warnings on Windows CE target. 2010-04-14 08:26:47 +02:00
Ralf Habacker
280cdc2ad8 Added missing test libraries and tools to keep in sync with autotools. 2010-04-13 21:18:41 +02:00
Ralf Habacker
ae9edf9b0d Keep defines for dbus test in sync with autotools. 2010-04-13 21:17:46 +02:00
Ralf Habacker
e828d41e3e Keep test file directories in sync with autotools 2010-04-13 21:17:31 +02:00
Ralf Habacker
9ba1517315 Defined DBUS_CMAKE in config.h to have a way for detecting the currently used buildsystem. 2010-04-13 21:15:29 +02:00
Romain Pokrzywka
9e034bd5b3 add missing HAVE_ macros to cmake 2010-04-13 20:17:14 +02:00