aboutsummaryrefslogtreecommitdiff
path: root/INSTALL.md
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2021-09-06 18:58:26 +0200
committerThomas White <taw@physics.org>2021-09-06 18:59:40 +0200
commitca389f6e41595e900dda0e3e4ad8febdb702126c (patch)
treeec93f75f5b02f85c52ebec84b56a772d0edabd73 /INSTALL.md
parentcf0bb2d7bca1b9a9e01ee268fbab76396fb68d34 (diff)
Meson: Get FDIP via a Wrap
Diffstat (limited to 'INSTALL.md')
-rw-r--r--INSTALL.md14
1 files changed, 7 insertions, 7 deletions
diff --git a/INSTALL.md b/INSTALL.md
index ee5ddf21..df4aeccd 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -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"