diff options
| -rw-r--r-- | INSTALL.md | 14 | ||||
| -rw-r--r-- | libcrystfel/meson.build | 4 | ||||
| -rw-r--r-- | subprojects/eigen.wrap | 12 | ||||
| -rw-r--r-- | subprojects/fdip.wrap | 8 |
4 files changed, 30 insertions, 8 deletions
@@ -44,9 +44,9 @@ roughly in order of importance: * [Cairo](https://www.cairographics.org/) 1.2 or later (required for GUI) * [Pango](https://pango.gnome.org/) 1.0 or later, including [PangoCairo](https://docs.gtk.org/PangoCairo/) (required for GUI) * [gdk-pixbuf](https://docs.gtk.org/gdk-pixbuf/) 2.0 or later (required for GUI) -* [libccp4](ftp://ftp.ccp4.ac.uk/opensource/) (required for MTZ import/export) +* [libccp4](ftp://ftp.ccp4.ac.uk/opensource/) \[\*\] (required for MTZ import/export) * [FFTW](http://fftw.org/) 3.0 or later (required for `asdf` indexing) -* [FDIP](https://stash.desy.de/users/gevorkov/repos/fastdiffractionimageprocessing/) (for `peakFinder9` peak search algorithm) +* [FDIP](https://stash.desy.de/users/gevorkov/repos/fastdiffractionimageprocessing/) \[\*\] (for `peakFinder9` peak search algorithm) * NCurses (for integration diagnostics: `indexamajig --int-diag`) Apart from FDIP, all of the dependencies mentioned above (including libccp4 - @@ -56,11 +56,11 @@ to download and install any of them separately from source. In particular, we emphatically recommend against trying to install GTK, Cairo, Pango or gdk-pixbuf from source. -If libccp4 is not available on the system and you compile using Meson, then -libccp4 will be downloaded and compiled automatically. If you don't want this, -add option `--wrap-mode=nofallback` when invoking Meson. See the Meson manual -for other possibilities, such as using locally-provided files instead of -downloading them. +If you compile using Meson, dependencies marked with \[\*\] above will be +downloaded and compiled automatically if they are not available on the system. +If you don't want this, add option `--wrap-mode=nofallback` when invoking +Meson. See the Meson manual for other possibilities, such as using +locally-provided files instead of downloading them. We also do not recommend using dependencies from Conda/Anaconda. Do not activate any Conda environment before compiling CrystFEL, not even the "base" diff --git a/libcrystfel/meson.build b/libcrystfel/meson.build index 026f2c8a..968e58a3 100644 --- a/libcrystfel/meson.build +++ b/libcrystfel/meson.build @@ -27,7 +27,9 @@ if pinkindexerdep.found() conf_data.set10('HAVE_PINKINDEXER', 1) endif -fdipdep = dependency('fdip', required: false) +fdipdep = dependency('fdip', + required: false, + fallback: ['fdip', 'fdip_dep']) if fdipdep.found() conf_data.set10('HAVE_FDIP', 1) endif diff --git a/subprojects/eigen.wrap b/subprojects/eigen.wrap new file mode 100644 index 00000000..240ecc4a --- /dev/null +++ b/subprojects/eigen.wrap @@ -0,0 +1,12 @@ +[wrap-file] +directory = eigen-3.3.9 +source_url = https://gitlab.com/libeigen/eigen/-/archive/3.3.9/eigen-3.3.9.tar.bz2 +source_filename = eigen-3.3.9.tar.bz2 +source_hash = 0fa5cafe78f66d2b501b43016858070d52ba47bd9b1016b0165a7b8e04675677 +patch_url = https://wrapdb.mesonbuild.com/v2/eigen_3.3.9-1/get_patch +patch_filename = eigen-3.3.9-1-wrap.zip +patch_hash = aaa175a6a5e93eb3228fd15f80063e2f722843e9b77744484383cad4fbe99ad8 + +[provide] +eigen3 = eigen_dep + diff --git a/subprojects/fdip.wrap b/subprojects/fdip.wrap new file mode 100644 index 00000000..e887aff9 --- /dev/null +++ b/subprojects/fdip.wrap @@ -0,0 +1,8 @@ +[wrap-git] +directory = fdip +url = https://gitlab.desy.de/thomas.white/fdip.git +revision = master +depth = 1 + +[provide] +fdip = fdip_dep |