diff options
author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-09-16 17:50:14 +0100 |
---|---|---|
committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-09-16 17:50:14 +0100 |
commit | 1909a82a8a871781f9a488881944912c7cc367e6 (patch) | |
tree | b06581f13abfc573246a0a6a2c3d253cbe993151 /cmake/CMakeLists.txt | |
parent | eca7a1c5e0b2fbb4edee3aa3965d2eec451bd66b (diff) | |
parent | 8874d3a0c57c0cae97cbe426e3686936da53f649 (diff) | |
download | dbus-1909a82a8a871781f9a488881944912c7cc367e6.tar.gz |
Merge branch 'dbus-1.8'
Conflicts:
NEWS
configure.ac
Diffstat (limited to 'cmake/CMakeLists.txt')
-rw-r--r-- | cmake/CMakeLists.txt | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index 799f3ba3..628a681a 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -411,10 +411,6 @@ endif (WIN32) set (DBUS_USER ) -# In Autotools this has a different default on QNX, but there seems little -# point in replicating that here; if you're on an unusual Unix, use Autotools. -set (DEFAULT_MESSAGE_UNIX_FDS 1024) - # This won't work on Windows. It's not meant to - the system bus is # meaningless on Windows anyway. # |