diff options
| author | Alexander Adolf <c-alpha@users.noreply.github.com> | 2019-04-25 17:05:30 +0200 |
|---|---|---|
| committer | Gaute Hope <eg@gaute.vetsj.com> | 2019-05-30 19:51:19 +0200 |
| commit | 1a40860e124f5c3a242d0c1ad7ade6e29fa92d36 (patch) | |
| tree | 5ecd762c790aaf2cf7c63e72b81c4ab1be9a5f89 | |
| parent | aae4c52091cc7ae28b336c19d2f0ac4a3a4056bf (diff) | |
Libffi is Now Required Unconditionally
gtkmm-3 now requires gobject-2, which in turn requires libffi. Hence,
libffi is no longer exclusive to builds with plugins, but is needed
for all builds.
| -rw-r--r-- | CMakeLists.txt | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 29b7232..a1ed742 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -84,6 +84,15 @@ if (Notmuch_INDEX_FILE_API) endif() find_package ( PkgConfig REQUIRED ) + +if(APPLE) + # with homebrew, libffi is keg-only, i.e. not symlinked into + # /usr/local; hence we have to tell pkg-config where to look + # for it + list ( APPEND CMAKE_PREFIX_PATH /usr/local/opt/libffi ) + pkg_check_modules (LIBFFI REQUIRED libffi>=3.0) +endif() + pkg_check_modules (GTKMM3 REQUIRED gtkmm-3.0>=3.10) pkg_check_modules (GLIBMM2 REQUIRED glibmm-2.4) pkg_check_modules (WEBKIT2GTK REQUIRED webkit2gtk-4.0>=2.22) @@ -450,12 +459,6 @@ if(DISABLE_PLUGINS) add_definitions ( -DDISABLE_PLUGINS ) message (STATUS "Disabling plugins.") else() - if(APPLE) - # with homebrew, libffi is keg-only, i.e. not symlinked into - # /usr/local; hence we have to tell pkg-config where to look for - # it - list ( APPEND CMAKE_PREFIX_PATH /usr/local/opt/libffi ) - endif() include (FindGObjectIntrospection) # this performs a pkg_check_modules() pkg_check_modules (PEAS libpeas-1.0>=1.0.0) if(INTROSPECTION_FOUND AND PEAS_FOUND) |