Continue to recommend CMake when building on Windows

In the longer term I'd like to move everything towards Meson so we only
have one primary build system, but at the moment Ralf would prefer to
keep recommending CMake for Windows builds (see dbus!378) so let's
stick with that for now.

Signed-off-by: Simon McVittie <smcv@collabora.com>

diff --git a/INSTALL b/INSTALL
index b58fb291aeb4c8513b441c04fa9a7377a01a78c2..4cfa4c87b80584e8440e4d169bfa2eaba9086602 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -6,7 +6,8 @@ Quick start
 
 This branch of dbus can be built by using Meson, GNU Autotools or CMake.
 The Meson build system is the recommended build system for the master
-branch (versions >= 1.15.0).
+branch (versions >= 1.15.0), except when building on Windows, for which
+CMake is recommended (this recommendation might change to Meson in future).
 
 Meson only supports out-of-tree builds, and must be passed a directory to put
 built and generated sources into. We'll call that directory "build" here. It's

diff --git a/NEWS b/NEWS
index d839b958d2388f831e08d449302eab9c01097429..f8a0795d28a69b42748825ccc8061d6984bb3fe2 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -4,7 +4,9 @@ dbus 1.15.8 (UNRELEASED)
 Build-time configuration changes:
 
 • For this version of dbus, Meson is the recommended build system for all
-  platforms. See INSTALL for details.
+  Unix platforms. CMake continues to be recommended for Windows, but this
+  recommendation might change to Meson in a future release, so please
+  test the Meson build. See INSTALL for details.
 
 • Autotools-generated files are no longer included in the tarball release.
   The Autotools build system is likely to be removed in a future dbus

diff --git a/README b/README
index adb960669e4249fea5e559ff2f6cdd05fbef6053..5398d87363190b222d5e2d6dee3377033677f91d 100644 (file)
--- a/README
+++ b/README
@@ -86,9 +86,10 @@ likely to have more bugs than stable releases, obviously.
 Configuration and installation
 ===
 
-This branch of dbus can be built by using Autotools, CMake or Meson.
+This branch of dbus can be built by using Meson, GNU Autotools or CMake.
 The Meson build system is the recommended build system for the master
-branch (versions >= 1.15.0).
+branch (versions >= 1.15.0), except when building on Windows, for which
+CMake is recommended (this recommendation might change to Meson in future).
 
 Please see `INSTALL` for full details.