From 84ab5a4cd5f7ab55aaa67f21bb4a145f57e1d8df Mon Sep 17 00:00:00 2001 From: Robbert van der Helm Date: Fri, 10 Jun 2022 15:13:39 +0200 Subject: [PATCH] Explicitly mention ghc_filesystem module name --- CHANGELOG.md | 5 +++++ meson.build | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9f4a6a88..34547236 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,11 @@ Versioning](https://semver.org/spec/v2.0.0.html). Meson will fall back to using the included wrap dependency. Configuring the project with `meson setup build -Dsystem-asio=true ...` will cause `` to be used instead. +- The `ghc_filesystem` dependency now explicitly mentions the + `ghcFilesystem::ghc_filesystem` CMake module because their inconsistent naming + prevents Meson from picking this up by default. The dependency will however + not work with `ghc::filesystem` 1.5.0's default CMake definition as they + forgot to include a version number. ## [4.0.0] - 2022-06-09 diff --git a/meson.build b/meson.build index a0a66a5e..a3a7f397 100644 --- a/meson.build +++ b/meson.build @@ -225,7 +225,7 @@ else bitsery_dep = dependency('bitsery', version : '>=5.2.0') endif function2_dep = dependency('function2', version : '>=4.0.0') -ghc_filesystem_dep = dependency('ghc_filesystem', version : '>=1.5.0') +ghc_filesystem_dep = dependency('ghc_filesystem', modules : 'ghcFilesystem::ghc_filesystem', version : '>=1.5.0') threads_dep = dependency('threads') tomlplusplus_dep = dependency('tomlplusplus', version : '>=2.0.0')