ariadne
/
pkgconf
3
6
Fork 4
Code Issues 6 Pull Requests 2 Projects Releases 2 Wiki Activity

Merge pull request #240 from Tachi107/readme-meson 

docs: mention Meson instead of CMake for Win build
pull/241/head
Ariadne Conill 2022-02-21 04:27:20 -06:00 committed by GitHub
parent 820af53a2d 0995e49977
commit ac964d13f3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
README.md
View File

@ -112,17 +112,16 @@ flags like so:
$ make $ make
$ sudo make install $ 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.
$ mkdir build pkgconf is compiled using [Meson](https://mesonbuild.com) on Windows. In theory, you could also use
$ cd build Meson to build on UNIX, but this is not recommended at this time as it pkgconf is typically built
$ cmake .. much earlier than Meson.
$ 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. 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 However, on Windows, the default PKGCONFIGDIR value is usually overridden at runtime based

3
libpkgconf/libpkgconf-api.h
View File

@ -2,8 +2,7 @@
#define LIBPKGCONF_LIBPKGCONF_API_H #define LIBPKGCONF_LIBPKGCONF_API_H
/* Makefile.am specifies visibility using the libtool option -export-symbols-regex '^pkgconf_' /* 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, * Unfortunately, that is not available when building with meson, so use attributes instead.
* in a way that doesn't depend on any cmake magic.
*/ */
#if defined(PKGCONFIG_IS_STATIC) #if defined(PKGCONFIG_IS_STATIC)
# define PKGCONF_API # define PKGCONF_API