diff options
| author | Thomas White <taw@physics.org> | 2023-08-29 16:22:21 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2023-08-29 16:22:21 +0200 |
| commit | b50c4f1609e0c030bf6574cf1fdc217e85ed3c33 (patch) | |
| tree | 16b9565baf2d850a5da5e4cdb8f7747d7ba5c64f | |
| parent | 65283ba88efca2a85e96fc1ac2128d3d999f8fa2 (diff) | |
Meson: Simplify Millepede build system
There are no dependencies, only a subproject via wrap.
| -rw-r--r-- | libcrystfel/meson.build | 7 | ||||
| -rw-r--r-- | meson.build | 4 | ||||
| -rw-r--r-- | subprojects/millepede.wrap | 3 | ||||
| -rw-r--r-- | subprojects/packagefiles/millepede/meson.build | 5 |
4 files changed, 7 insertions, 12 deletions
diff --git a/libcrystfel/meson.build b/libcrystfel/meson.build index 23b267c1..497abef6 100644 --- a/libcrystfel/meson.build +++ b/libcrystfel/meson.build @@ -38,10 +38,6 @@ else cjsondep = dependency('', required : false) endif -millepededep = dependency('millepede', - required: false, - fallback: ['millepede', 'millepede_dep']) - xgandalfdep = dependency('xgandalf', required: false, fallback: ['xgandalf', 'xgandalf_dep']) @@ -172,8 +168,7 @@ libcrystfel = library('crystfel', [libcrystfel_sources, libcrystfel_versionc], dependencies: [mdep, utildep, fftwdep, gsldep, zlibdep, hdf5dep, pthreaddep, xgandalfdep, pinkindexerdep, fdipdep, - ccp4dep, msgpackdep, seedeedep, cjsondep, - millepededep], + ccp4dep, msgpackdep, seedeedep, cjsondep], install: true) libcrystfeldep = declare_dependency(include_directories: libcrystfel_includes, diff --git a/meson.build b/meson.build index 19266444..11382f1d 100644 --- a/meson.build +++ b/meson.build @@ -162,6 +162,10 @@ executable('align_detector', install: true, install_rpath: '$ORIGIN/../lib64/:$ORIGIN/../lib') +# Get 'pede' from the subproject (needed for align_detector) +millepede_proj = subproject('millepede') +pede_exe = millepede_proj.get_variable('pede') + # adjust_detector adjust_detector = executable('adjust_detector', ['src/adjust_detector.c', versionc], diff --git a/subprojects/millepede.wrap b/subprojects/millepede.wrap index 5541d2bc..dc124637 100644 --- a/subprojects/millepede.wrap +++ b/subprojects/millepede.wrap @@ -4,6 +4,3 @@ url = https://gitlab.desy.de/claus.kleinwort/millepede-ii.git revision = main depth = 1 patch_directory = millepede - -[provide] -millepede = millepede_dep diff --git a/subprojects/packagefiles/millepede/meson.build b/subprojects/packagefiles/millepede/meson.build index 2857205f..eab03d24 100644 --- a/subprojects/packagefiles/millepede/meson.build +++ b/subprojects/packagefiles/millepede/meson.build @@ -11,9 +11,7 @@ if zlibdep.found() pede_c_args += '-DUSE_ZLIB' endif -millepede_dep = declare_dependency() - -executable('pede', +pede = executable('pede', ['mpdef.f90', 'mpdalc.f90', 'mpmod.f90', @@ -39,5 +37,6 @@ executable('pede', 'readc.c'], fortran_args: ['-DREAD_C_FILES', '-cpp'], c_args: pede_c_args, + build_by_default: true, dependencies: [zlibdep], install: true) |