summaryrefslogtreecommitdiff
path: root/cmake
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/dbus-1.4'Simon McVittie2011-07-111-0/+2
|\
| * Added DBUS_ENABLE_STATS option to cmake buildsystem to keep in sync with ↵Ralf Habacker2011-07-083-0/+10
| | | | | | | | autotools.
| * Collected cmake doc into README.cmake.Ralf Habacker2011-07-081-39/+0
| |
* | Fixed cmake buildsystem - option command only supports boolean valuesRalf Habacker2011-07-041-3/+3
| |
* | Limit batch file creating to windowsRalf Habacker2011-07-031-0/+4
| |
* | Fixed cmake buildsystem on unix - option command only supports boolean valuesRalf Habacker2011-07-031-2/+2
| |
* | Collected cmake doc into README.cmake.Ralf Habacker2011-07-021-39/+0
| |
* | Added DBUS_ENABLE_STATS option to cmake buildsystem to keep in sync with ↵Ralf Habacker2011-07-023-0/+10
| | | | | | | | autotools.
* | CMake fix: Do not use FORCE in variables which should be changeable by the user.Ralf Habacker2011-06-201-3/+3
| |
* | fixed cmake error: doc says CACHE needs type *and* doc stringRalf Habacker2011-06-141-5/+5
| |
* | Merge branch 'dbus-1.4'Simon McVittie2011-06-101-1/+1
|\ \ | |/
| * Add support for building "modular" tests, which require GLib and dbus-glibSimon McVittie2011-06-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Fixes for Visual Studio 2010 cmake generator - reported by Ray Satiro.Ralf Habacker2011-05-282-3/+7
| |
* | Fixed cmake syntax errors.Ralf Habacker2011-05-281-5/+5
| |
* | Merge branch 'dbus-1.4'Simon McVittie2011-05-251-0/+5
|\ \ | |/
| * Check for X even if X11 autolaunching is disabledSimon McVittie2011-05-251-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * Definition is obsolate with commit e0fc90bdf2c60a4c77fffaf490d6f06b2bd6999dRalf Habacker2011-05-251-5/+0
| |
| * To avoid double dbus version definitions take values from configure.ac.Ralf Habacker2011-05-251-3/+7
| |
* | Added cmake 'help-options' target to print out all available configure optionsRalf Habacker2011-05-221-0/+5
| |
* | Cleaned public cmake option naming.Ralf Habacker2011-05-221-22/+22
| |
* | Definition is obsolate with commit e0fc90bdf2c60a4c77fffaf490d6f06b2bd6999dRalf Habacker2011-05-221-5/+0
| |
* | To avoid double dbus version definitions take values from configure.ac.Ralf Habacker2011-05-221-3/+7
|/
* Allow X11 autolaunch to be disabled even if the headers/libraries are thereSimon McVittie2011-02-241-1/+1
| | | | | | | | | | | | | | | | 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
* Import compiler.m4 and lcov.am from telepathy-glib, and use them to replace gcovSimon McVittie2011-02-171-7/+0
| | | | | Reviewed-by: Colin Walters <walters@verbum.org> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=10887
* Remove references to dbus-md5, which hasn't been used for at least 8 yearsSimon McVittie2011-02-171-5/+0
| | | | | Reviewed-by: Colin Walters <walters@verbum.org> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=34292
* cmake/cross-compile.sh: use mktemp(1) to avoid a symlink attack in /tmpSimon McVittie2011-01-051-5/+10
|
* Use absolute session service dir path in bus-test on windows.Ralf Habacker2010-12-291-0/+5
|
* Keep in sync with autotools.Ralf Habacker2010-12-291-1/+1
|
* Keep in sync with automake.Ralf Habacker2010-12-211-1/+1
|
* Fix bus-test failure with cmake on unix.Ralf Habacker2010-12-071-2/+2
| | | | SHA1 connection tests needs an non debug-pipe transport for the activation bus.
* Keep in sync with automake.Ralf Habacker2010-12-041-0/+4
|
* Service dir related bug fix on windows.Ralf Habacker2010-10-292-33/+48
| | | | | | 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.
* Cleaned up windows related README's.Ralf Habacker2010-10-121-1/+1
|
* Fixed reference to cmake configure options.Ralf Habacker2010-10-121-17/+2
|
* keep version in sync with automakeRalf Habacker2010-10-121-3/+2
|
* Extended autolaunch protocol with scope attribute.Ralf Habacker2010-09-271-1/+1
|
* Unix compile fix.Ralf Habacker2010-09-081-0/+2
|
* Revert "Bug 28460 - Refactored dbus configuration access."Will Thompson2010-06-171-2/+0
| | | | | | This reverts commit 6f9077ee870ad02119facf83d1293301b4535c3b, which broke the build on Unix (see previous patch) and introduced a bunch of warnings.
* Bug 28460 - Refactored dbus configuration access.Ralf Habacker2010-06-141-0/+2
| | | | | | | | | | | | | | | | | | 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.
* Keep cmake default session and system bus address setup in sync with autotools.Ralf Habacker2010-06-111-10/+5
|
* Keep in sync with autotools.Ralf Habacker2010-06-071-2/+2
|
* Keep in sync with autotools.Ralf Habacker2010-06-071-1/+1
|
* fix {u}intptr_t usage on wince with msvcRomain Pokrzywka2010-05-052-0/+4
|
* Don't truncate pointers on Windows x64 platformFridrich Štrba2010-05-033-1/+5
|
* Merge branch 'master' of ssh://git.freedesktop.org/git/dbus/dbusRalf Habacker2010-04-272-3/+105
|\
| * Added cmake cross compile wrapper.Ralf Habacker2010-04-221-0/+105
| |
| * Removed obsolate file.Ralf Habacker2010-04-161-3/+0
| |
* | Minor name spelling fix.Ralf Habacker2010-04-271-1/+1
|/
* Fix warnings on Windows CE target.Marcus Brinkmann2010-04-142-0/+4
|
* Added missing test libraries and tools to keep in sync with autotools.Ralf Habacker2010-04-132-0/+26
|