summaryrefslogtreecommitdiff
path: root/cmake/bus
Commit message (Collapse)AuthorAgeFilesLines
* Move cmake related build system to top levelRalf Habacker2019-01-221-204/+0
| | | | Signed-off-by: Ralf Habacker <ralf.habacker@freenet.de>
* test: Move dbus-daemon-launch-helper-test here, and renameSimon McVittie2019-01-211-8/+0
| | | | | | | | | The -test suffix does not indicate that this is a test, but rather that it is for tests (similar to the -unix and -win suffixes on modules like dbus-sysdeps). This seems unnecessarily confusing, so rename it to end with -for-tests. Signed-off-by: Simon McVittie <smcv@collabora.com>
* test: Move dbus-daemon and d-d-launch-helper tests from bus/Simon McVittie2019-01-211-9/+0
| | | | | | | This groups them with the other tests, and avoids having them influence the test coverage stats in bus/. Signed-off-by: Simon McVittie <smcv@collabora.com>
* build: Compile most bus/ files into static librariesSimon McVittie2019-01-211-21/+18
| | | | | | | | This means we can share them between tests without having to compile the same file repeatedly, and makes them easier to share between directories when we move test executables into test/. Signed-off-by: Simon McVittie <smcv@collabora.com>
* In cmake use variables provided from GNUInstallDirs consequentlyRalf Habacker2018-12-211-9/+9
| | | | | This is required to support a custom installation layout, e.g. the KDE binary factory.
* cmake: Install d-d-launch-helper to ${CMAKE_INSTALL_LIBEXECDIR}Simon McVittie2018-10-251-1/+1
| | | | | | | | | | Instead of hard-coding the lib subdirectory of the installation prefix, use the ${CMAKE_INSTALL_LIBEXECDIR} provided by the GNUInstallDirs module, which defaults to the libexec subdirectory of the installation prefix. This is consistent with the Autotools build system, which installs to ${exec_prefix}/libexec unless modified with --libexecdir. Signed-off-by: Simon McVittie <smcv@collabora.com>
* cmake: Use non-deprecated install mechanism for d-d-launch-helperSimon McVittie2018-10-251-1/+1
| | | | | | As suggested by Ralf Habacker on !9. Signed-off-by: Simon McVittie <smcv@collabora.com>
* cmake: Install dbus-daemon-launch-helper even if tests are disabledSimon McVittie2018-10-251-1/+1
| | | | | | | This is a long-standing bug, spotted while moving test code into the test directory. Signed-off-by: Simon McVittie <smcv@collabora.com>
* Cleanup of the cmake definitions of source directoriesRalf Habacker2018-10-251-1/+1
| | | | | | | | | Since the cmake build system is located below the cmake/ subdirectory, references to the source files used such as ../../bus or ${CMAKE_SOURCE_DIR}/../dbus etc. are required. To standardize and simplify this, a cmake variable is now defined in each of the listed directories, which contains the corresponding path.
* Add version info to installed executables for cmake build system on WindowsRalf Habacker2018-03-121-3/+16
| | | | | | Signed-off-by: Ralf Habacker <ralf.habacker@freenet.de> Reviewed-by: Simon McVittie <smcv@collabora.com> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=103387
* driver: Add a stub implementation of the Containers1 interfaceSimon McVittie2017-12-111-0/+2
| | | | | | | | | | For now, this is considered to be a privileged operation, because the resource-limiting isn't wired up yet. It only contains the bare minimum of API. Signed-off-by: Simon McVittie <smcv@collabora.com> Reviewed-by: Philip Withnall <withnall@endlessm.com> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=101354
* build: Remove indirection from uses of ExpatSimon McVittie2017-04-101-12/+12
| | | | | | | | We haven't supported XML libraries other than Expat since 2013. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=69801 Signed-off-by: Simon McVittie <smcv@collabora.com> Reviewed-by: Philip Withnall <withnall@endlessm.com>
* Replace deprecated cmake install_ functions with related install(...) calls.Ralf Habacker2017-01-301-2/+2
| | | | | Reviewed-by: Simon McVittie <smcv@debian.org> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=99586
* Only compile test-bus-launch-helper, etc. if embedded tests are enabledSimon McVittie2016-08-161-25/+22
| | | | | | | | | | | | | These source files are specific to the embedded tests and make no sense otherwise. Also remove a comment in the CMake build system about fixing the build of the activation helper on Windows: the activation helper is Unix-specific and always will be, since it relies on Unix setuid to function. Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=94094
* bus: move shared libaudit code to a new audit.[ch]Simon McVittie2015-08-061-0/+2
| | | | | | | | | | | | | | | | | | | | | | This fixes various duplicated libaudit interactions in both SELinux and AppArmor code paths, including opening two audit sockets if both SELinux and AppArmor were enabled at compile time. In particular, audit.c is now the only user of libcap-ng. This commit is not intended to introduce any functional changes, except for the de-duplication. The actual audit_log_user_avc_message() call is still duplicated, because the SELinux and AppArmor code paths use different mechanisms to compose the audit message: the SELinux path uses a statically-sized buffer on the stack which might be subject to truncation, whereas the AppArmor path uses malloc() (via DBusString) and falls back to using syslog on a memory allocation failure. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=89225 Reviewed-by: Colin Walters <walters@verbum.org> [smcv: minor issues raised during review are subsequently fixed] Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
* Adjust cmake build to match autoconf installation locations.Dimitri John Ledkov2015-05-272-67/+10
| | | | | Bug: https://bugs.freedesktop.org/show_bug.cgi?id=89280 Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
* Add apparmor element support to bus config parsingTyler Hicks2015-02-181-0/+2
| | | | | | | | | | | | | | | | | | | The <apparmor> element can contain a single mode attribute that has one of three values: "enabled" "disabled" "required" "enabled" means that kernel support is autodetected and, if available, AppArmor mediation occurs in dbus-daemon. If kernel support is not detected, mediation is disabled. "disabled" means that mediation does not occur. "required" means that kernel support must be detected for dbus-daemon to start. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=75113 Signed-off-by: Tyler Hicks <tyhicks@canonical.com> Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
* Fix usage of undefined variable DBUS_WIN32 on cmake build systemRalf Habacker2015-01-051-1/+1
| | | | | Bug: https://bugs.freedesktop.org/show_bug.cgi?id=88010 Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
* Build test-bus-system with cmake on non win32 platforms.Ralf Habacker2014-09-181-1/+15
| | | | | Bug: https://bugs.freedesktop.org/show_bug.cgi?id=83583 Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
* Fix installation of empty directories for cmake build system.Ralf Habacker2014-09-151-9/+14
| | | | | | | | | | The differences has been found out by comparing with the cross compiled mingw..-dbus packages. [exclude system bus support bits on Windows -smcv] Bug: https://bugs.freedesktop.org/show_bug.cgi?id=83583 Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
* Rename bus-test-launch-helper to test-bus-launch_helper to match common test ↵Ralf Habacker2014-01-171-2/+2
| | | | | | | application naming scheme. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=73495 Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
* Rename bus-test to test-bus to match common test application naming scheme.Ralf Habacker2014-01-171-2/+2
| | | | | Bug: https://bugs.freedesktop.org/show_bug.cgi?id=73495 Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
* Use macros for test and helper executable targets on cmake build system.Ralf Habacker2014-01-101-7/+4
| | | | | | | | | | | | | | | The new macros add_test_executables and add helper_executables provides a platform independent way for specifing dbus test and service applications. On native Windows and Linux/UNIX systems the test applications are directly runable. When cross compiling for Windows on Linux test applications could be executed on the Linux host system with the help of wine and activated binfmt_misc support for wine. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41252 Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
* Remove obsolete cmake project tags in sub directories; we only have one project.Ralf Habacker2014-01-081-2/+0
| | | | | Bug: https://bugs.freedesktop.org/show_bug.cgi?id=68506 Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
* tests to embedded tests: replaced in cmake filesChengwei Yang2013-06-281-2/+2
| | | | | | Signed-off-by: Chengwei Yang <chengwei.yang@intel.com> Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=66291
* cmake: align dir watch backend detection with autotoolsChengwei Yang2013-06-281-7/+10
| | | | | | Signed-off-by: Chengwei Yang <chengwei.yang@intel.com> Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=66257
* XML: hard depends on expat and delete libxmlChengwei Yang2013-06-061-5/+1
| | | | | | | | | [The libxml code path has been broken for at least 2.5 years, and Expat is tiny, so there seems no point in supporting both. -smcv] Bug: https://bugs.freedesktop.org/show_bug.cgi?id=20253 Signed-off-by: Chengwei Yang <chengwei.yang@intel.com> Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
* Moved docbook sources used by cmake into doc subdir and adapted cmake build ↵Ralf Habacker2013-02-141-752/+0
| | | | | | | system. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=59805 Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
* Create missing directories in cmake <build-root>/bus/session.d and ↵Ralf Habacker2013-01-151-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>
* doc: update documentation with own_prefix policy rulesAlban Crequy2012-03-221-0/+8
| | | | https://bugs.freedesktop.org/show_bug.cgi?id=46886
* Revert "made session service dirs customizable: cmake part"Simon McVittie2012-01-041-2/+0
| | | | | This reverts commit 89e453216c02bb85c5e53d459997f8bc3b2c73d4. It makes the tests fail under autotools.
* made session service dirs customizable: cmake partRalf Habacker2011-11-211-0/+2
|
* Install empty session.d config directory using cmake, otherwise dbus-daemon ↵Ralf Habacker2011-10-171-0/+1
| | | | | | | will not start Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41319
* Merged cmake and autotools session bus configurationRalf Habacker2011-09-292-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
* Added DBUS_ENABLE_STATS option to cmake buildsystem to keep in sync with ↵Ralf Habacker2011-07-021-0/+6
| | | | autotools.
* Keep in sync with autotools.Ralf Habacker2010-06-071-1/+1
|
* Make the windows binaries and build match the linux one with cmake buildsystem.unknown2010-03-221-0/+3
| | | | | This is performed by including the files from the client lib in the internal one and by removing the linking to dbus-1 for targets using the internal library.
* CMake dbus libraries usage cleanup.Ralf Habacker2010-03-201-8/+6
| | | | | | Renamed DBUS_LIBRARIES to DBUS_INTERNAL_LIBRARIES and moved to top level CMakeLists.txt. Removed obsolate references of dbus-internal library. Added DBUS_LIBRARIES definition which contains only the dbus library.
* added some docs for windows and updated the documentation indexRalf Habacker2010-02-101-0/+744
|
* remove DBUS_DAEMON_EXECUTABLE_NAME, we already have DBUS_DAEMON_NAME, and ↵Romain Pokrzywka2010-02-071-0/+1
| | | | use the specified name for the executable when building with cmake
* remove the debug postfix for the executables, it only makes sense for the libRomain Pokrzywka2010-02-071-6/+0
|
* commented bits cleanupRomain Pokrzywka2010-02-071-14/+0
|
* refactor the cmake build to match with autotools: only export client symbols ↵Romain Pokrzywka2010-02-071-25/+14
| | | | in dbus-1 and use and internal library for the rest. Currently this library is statically linked to the apps but it can be made dynamic if wanted
* disable launch-helper on windows for now until it builds (cherry picked from ↵Frank Osterfeld2009-11-301-11/+15
| | | | commit 48da3a0450172f711c25a459ce70c2521d22ee27)
* bus-test-launch-helper is a unit test, test-service and test-shell-service ↵Frank Osterfeld2009-11-301-1/+1
| | | | are not. Rename test-shell to shell-test to match autotools (cherry picked from commit b106387b73d6a300a013a15f6507244e82f007ed)
* build dbus-daemon-launch-helper-test and friends set all TEST vars needed ↵Frank Osterfeld2009-11-301-0/+20
| | | | for the .in files (cherry picked from commit fcd9ba392927b0433e5e037d393230774edae303)
* do not add d suffix on non-windows (cherry picked from commit ↵Frank Osterfeld2009-11-301-3/+6
| | | | 27980491d3cac6166c30c4adc2c71d80c3e4e13a)
* use correct test data dir (cherry picked from commit ↵Frank Osterfeld2009-11-301-1/+1
| | | | ef471a74068b198ed10fe2a377520aa6a68b8370)
* merge changes done to the cmake-buildsystem from the sf.net windbus-svn ↵Christian Ehrlicher2009-11-301-24/+29
| | | | trunk. tested and works fine with at least msvc2008. (cherry picked from commit 45c168fd61e3f6447e014df4bb6417efbe725ccd)
* * cmake/: don't install test applications and service files, moved ↵Ralf Habacker2007-04-281-4/+4
| | | | CMAKE_DEBUG_POSTFIX to top level CMakeLists.txt
View Lorry Controller Status