aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2021-10-07 11:45:47 +0200
committerThomas White <taw@physics.org>2021-10-07 11:45:47 +0200
commitdf3c7836b3aaa6283024e9b932a5b0fe08265248 (patch)
treed9a567349d0db522941213b7319536d8303ca180
parent0d55e6d2cce801b3b83161ed8e9e289a8db86e49 (diff)
Meson: Get PinkIndexer via wrap
-rw-r--r--libcrystfel/meson.build4
-rw-r--r--subprojects/pinkindexer.wrap8
2 files changed, 11 insertions, 1 deletions
diff --git a/libcrystfel/meson.build b/libcrystfel/meson.build
index 5c8a0652..35893115 100644
--- a/libcrystfel/meson.build
+++ b/libcrystfel/meson.build
@@ -24,7 +24,9 @@ if xgandalfdep.found()
conf_data.set10('HAVE_XGANDALF', 1)
endif
-pinkindexerdep = dependency('pinkIndexer', required: false)
+pinkindexerdep = dependency('pinkIndexer',
+ required: false,
+ fallback: ['pinkindexer', 'pinkindexer_dep'])
if pinkindexerdep.found()
conf_data.set10('HAVE_PINKINDEXER', 1)
endif
diff --git a/subprojects/pinkindexer.wrap b/subprojects/pinkindexer.wrap
new file mode 100644
index 00000000..26f98b37
--- /dev/null
+++ b/subprojects/pinkindexer.wrap
@@ -0,0 +1,8 @@
+[wrap-git]
+directory = pinkindexer
+url = https://gitlab.desy.de/thomas.white/pinkindexer.git
+revision = main
+depth = 1
+
+[provide]
+pinkindexer = pinkindexer_dep