From 6109e060892cb152825ceff1253d3a256c20c0b7 Mon Sep 17 00:00:00 2001 From: Andrea Pappacoda Date: Sat, 11 Dec 2021 14:49:05 +0100 Subject: [PATCH] docs: mention Meson instead of CMake for Win build Fixes #233 --- README.md | 16 +++++++--------- libpkgconf/libpkgconf-api.h | 3 +-- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 5c65b84..37941dd 100644 --- a/README.md +++ b/README.md @@ -111,17 +111,15 @@ flags like so: $ make $ sudo make install -## compiling `pkgconf` and `libpkgconf` with CMake (usually for Windows) +## compiling `pkgconf` and `libpkgconf` with Meson (usually for Windows) -pkgconf is compiled using CMake on Windows. In theory, you could also use CMake to build -on UNIX, but this is not recommended at this time as it pkgconf is typically built much earlier -than CMake. +pkgconf is compiled using [Meson](https://mesonbuild.com) on Windows. In theory, you could also use +Meson to build on UNIX, but this is not recommended at this time as it pkgconf is typically built +much earlier than Meson. - $ mkdir build - $ cd build - $ cmake .. - $ make - $ sudo make install + $ meson setup build -Dtests=false + $ meson compile -C build + $ meson install -C build There are a few defines such as SYSTEM_LIBDIR, PKGCONFIGDIR and SYSTEM_INCLUDEDIR. However, on Windows, the default PKGCONFIGDIR value is usually overridden at runtime based diff --git a/libpkgconf/libpkgconf-api.h b/libpkgconf/libpkgconf-api.h index e76f31e..a924c80 100644 --- a/libpkgconf/libpkgconf-api.h +++ b/libpkgconf/libpkgconf-api.h @@ -2,8 +2,7 @@ #define LIBPKGCONF_LIBPKGCONF_API_H /* Makefile.am specifies visibility using the libtool option -export-symbols-regex '^pkgconf_' - * Unfortunately, that is not available when building with cmake, so use attributes instead, - * in a way that doesn't depend on any cmake magic. + * Unfortunately, that is not available when building with meson, so use attributes instead. */ #if defined(PKGCONFIG_IS_STATIC) # define PKGCONF_API