summaryrefslogtreecommitdiff
path: root/cmake
AgeCommit message (Collapse)AuthorFilesLines
2013-04-05Add function _dbus_get_peer_pid_from_tcp_handle() which returns pid and sid ↵Ralf Habacker1-2/+2
from tcp connection peer. This function is called by _dbus_read_credentials_socket() to fetch client credentials. Because Wine is used to check cross compiled dbus for windows, in calls to GetExtendedTcpTable() we use table class TCP_TABLE_OWNER_PID_ALL instead of TCP_TABLE_OWNER_PID_CONNECTIONS. This class is the only one which is available since wine 1.5.3. https://bugs.freedesktop.org/show_bug.cgi?id=61787 Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2013-03-04CMake linux fixes when using meinproc4 doc generator.Ralf Habacker1-4/+7
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=61637 Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2013-03-04Fix cmake linux build: dbus-1 and dbus-internal require to link to rt libraryRalf Habacker1-2/+2
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=61637 Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2013-02-18Removed precarious cross compile shell script.Ralf Habacker1-110/+0
CMake provides a standardized way to cross compile packages by using -DCMAKE_TOOLCHAIN_FILE at configure time. Also recent distributions like opensuse provides up to date native mingw binary packages and cross compile packages which reduces the cross compile setup to package installation and setup of a cross tool chain file as documented at http://www.vtk.org/Wiki/CMake_Cross_Compiling. https://bugs.freedesktop.org/show_bug.cgi?id=59733 Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2013-02-14Turn all man pages' source into configure-generated filesSimon McVittie1-5/+10
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=59805 Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de> [dropped whitespace changes per Ralf's review -smcv] Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2013-02-14Generate man pages from xml docbook sources for cmake buildsystem.Ralf Habacker1-9/+27
[removed commented line -smcv] Bug: https://bugs.freedesktop.org/show_bug.cgi?id=59805 Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2013-02-14Updated man docbook xml sources from man page source using doclifter.Ralf Habacker1-0/+2
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=59805 Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2013-02-14Moved docbook sources used by cmake into doc subdir and adapted cmake build ↵Ralf Habacker5-1264/+10
system. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=59805 Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2013-02-12Fixed cmake cross compile timestamp creating.Ralf Habacker1-6/+3
We only need to distinct "Windows" from unix like systems Bug: https://bugs.freedesktop.org/show_bug.cgi?id=59733 Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2013-02-12Uses cmake provided expat find package.Ralf Habacker2-68/+8
The cmake provided expat find package is more up to date. There is no need to maintain an additional one. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=59733 Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2013-01-29CMake build system fix: Lets check for xmlto doc book generator first.Ralf Habacker1-9/+7
We shouldn't try to build the documentation with meinproc *and* xmlto. Prefer xmlto, since it's also the one we use under Autotools. We still need to support meinproc as a fallback, because xmlto isn't available on Windows. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=59733 Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2013-01-15Fixed cmake warning related to WIN32 macro when configuring on cygwinRalf Habacker1-0/+3
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=59401 Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2013-01-15Create missing directories in cmake <build-root>/bus/session.d and ↵Ralf Habacker1-0/+3
<build-root>/bus/system.d Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41319 Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2012-08-13Split DBUS_SESSION_BUS_DEFAULT_ADDRESS into listen, connect addresses and ↵Simon McVittie3-6/+9
set better defaults On Unix, the connect address should basically always be "autolaunch:" but the listen address has to be something you can listen on. On Windows, you can listen on "autolaunch:" or "autolaunch:scope=*install-path", for instance, and the dbus-daemon is involved in the auto-launching process. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=38201 Reviewed-by: David Zeuthen <davidz@redhat.com> [default address changed to autolaunch: for interop with GDBus -smcv] Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2012-08-13cmake: use the same default system bus address as for autotoolsSimon McVittie1-2/+9
The system bus is unsupported (and rather meaningless) on Windows anyway, so we can use anything. Also, make it clear that it has to be a "specific" address that can be listened on *and* connected to, like unix:path=/xxx - a listen-only address like unix:tmpdir=/xxx or nonce-tcp: would not be suitable. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=38201 Reviewed-by: David Zeuthen <davidz@redhat.com>
2012-06-15On Unix, link libdbus to a platform-specific threading librarySimon McVittie2-0/+6
On Linux, this is libpthread; on other Unixes, in principle it might be called libpthreads or libthreads or something. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=47237 Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk> Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
2012-03-22doc: update documentation with own_prefix policy rulesAlban Crequy1-0/+8
https://bugs.freedesktop.org/show_bug.cgi?id=46886
2012-02-24Add dbus-syntax.[ch]Simon McVittie1-0/+2
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=39549 Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk> Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
2012-02-09Windows compile fixRalf Habacker1-0/+3
BUG: https://bugs.freedesktop.org/show_bug.cgi?id=45832
2012-01-04Revert "keep cmake in sync with automake related to default bus addresses"Simon McVittie1-2/+2
This reverts commit fdab4af0f4748f1fb5d23ca41e201cca4adb0b2f. Further discussion required. Related to https://bugs.freedesktop.org/show_bug.cgi?id=38201
2012-01-04Revert "made session service dirs customizable: cmake part"Simon McVittie2-5/+0
This reverts commit 89e453216c02bb85c5e53d459997f8bc3b2c73d4. It makes the tests fail under autotools.
2011-12-22keep cmake in sync with automake related to default bus addressesRalf Habacker1-2/+2
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=38201
2011-12-21Merge branch 'dbus-1.4'Ralf Habacker2-13/+46
2011-12-21Merge branch 'dbus-1.4' of ssh://git.freedesktop.org/git/dbus/dbus into dbus-1.4Ralf Habacker2-13/+46
2011-11-21made session service dirs customizable: cmake partRalf Habacker2-0/+5
2011-10-29refactored cmake version extracting from configure.acRalf Habacker2-13/+46
2011-10-17Install empty session.d config directory using cmake, otherwise dbus-daemon ↵Ralf Habacker1-0/+1
will not start Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41319
2011-10-12cmake: don't include -util sources in the shared librarySimon McVittie1-4/+0
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=34976 Reviewed-by: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
2011-10-12Remove dbus-auth-script from the shared librarySimon McVittie1-2/+2
Only the tests use this. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=34976 Reviewed-by: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
2011-09-29Merged cmake and autotools session bus configurationRalf Habacker2-33/+2
cmake and autotools session bus configuration templates are identical, so cmake now uses the autotools. Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41319
2011-09-28Remove EXT variable from CMake, just use Automake-compatible EXEEXTSimon McVittie2-3/+3
According to Ralf, there's no standard name for this in CMake, so we might as well use the standard Automake name. Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk> Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41222
2011-09-28Merge tests' cmake and autotools bus configurationSimon McVittie3-9/+2
In Unix, the tests listened on both debug-pipe (which is a socketpair, or a TCP emulation of socketpair on Windows) and a Unix socket. In the Windows port, the tests were hard-coded to listen on a particular port, which allowed the dispatch test to connect to that port, as long as no two tests ran simultaneously (which I don't think was ever guaranteed - make -j can violate this). That's valid out-of-process, and also fully-specified, so they only needed one <listen> directive, so the CMake input only had one. To make the tests work under CMake on Unix, there was a hack: the string substituted for the content of the <listen> directive contained </listen><listen> to get the other address in, which is pretty nasty. Instead of doing that, I've made both build systems, on both Unix and Windows, use both debug-pipe and a more normal transport (Unix or TCP). debug-pipe has a Windows implementation and it's used in dbus-spawn-win.c, so it'd better work. The use of debug-pipe is now hard-coded rather than being a configure parameter (there's no reason to vary it in different builds), and I used TEST_LISTEN as the name of the Unix/TCP address, because it's a "vague" address (no specific Unix path, no TCP port), that you can listen on but not connect to. This in turn means that we can merge the Autoconf .in and CMake .cmake files, similar to Bug #41033. You might wonder why I've kept debug-pipe. I did try to get rid of it, but it turns out that the tests in dispatch.c rely on dbus_connection_open_private() not blocking, and normal socket connections block on connect(). Until we fix that by adding an async version of dbus_connection_open_private(), it won't be safe to have a test like dispatch.c that "talks to itself", unless it uses a transport as trivial as debug-pipe in which neither end has to block on the other. Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk> Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41222
2011-09-28cmake: remove unused TEST_SERVICE_DIR variableSimon McVittie1-2/+0
Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk> Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41222
2011-09-28Simplify substitution of test executables to use fewer variablesSimon McVittie2-18/+8
Also use EXEEXT in all the service files, even in the automake build system. Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk> Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41222
2011-09-28Simplify generation of bus configuration filesSimon McVittie1-3/+1
Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk> Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41222
2011-09-24Merge branch 'dbus-1.4'Ralf Habacker3-95/+24
2011-09-23Use dbus/dbus-arch-deps.h.in as source for cmake tooRalf Habacker3-95/+24
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41033 Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2011-09-22Merge branch 'dbus-1.4'Ralf Habacker2-15/+27
Conflicts: cmake/CMakeLists.txt
2011-09-22Added cmake 'help-options' target to print out all available configure optionsRalf Habacker1-0/+5
cherry-picked 5a0c5663ebf0b75503dfa6a60c01df07a29d3334
2011-09-22fixed cmake error: doc says CACHE needs type *and* doc stringRalf Habacker1-6/+5
cherry-picked aba867f2422d06393f610c6cd8c6b147b4fd6c38
2011-09-22Limit batch file creating to windowsRalf Habacker1-0/+4
cherry-picked 84b03cae585274bfe54e2a234dff72469cef581d
2011-09-22Fixed cmake buildsystem - option command only supports boolean valuesRalf Habacker1-3/+3
Conflicts: cmake/CMakeLists.txt cherry picked 4ee7b07b208f64f3b76f253c449e86e86849fca8 from master Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2011-09-22cmake fix: generate build timestampRalf Habacker2-5/+18
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41029 Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2011-09-22Simplified cmake xml parser dependencies.Ralf Habacker1-9/+9
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-20Merge branch 'dbus-1.4'Ralf Habacker1-0/+11
2011-09-20cmake fix: install version stringRalf Habacker1-0/+11
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=40905
2011-08-13Fix compilation on MSVC, which doesn't understand "inline" with its C99 meaning.Ralf Habacker1-4/+2
This fix is limited to msvc compilers only. Reviewed-by:Simon McVittie <simon.mcvittie@collabora.co.uk>
2011-08-05Win32 compile fix.Ralf Habacker1-0/+6
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-05Merge branch 'dbus-1.4'Simon McVittie1-0/+3
2011-08-05cmake: always enable GNU and recent-POSIX extensions, like autoconf doesSimon McVittie1-0/+3
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>
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-22 23:38:25 +0000