From 0d349fcee81d566c0ec615ae5be4842a1bc9fa03 Mon Sep 17 00:00:00 2001 From: Matthias Wittgen Date: Wed, 28 Oct 2026 07:12:50 -0700 Subject: [PATCH] Configure through a pkg-config template --- .gitignore | 3 +++ SConstruct | 2 +- lsst_ip_diffim.pc.in | 12 ++++++++++++ ups/ip_diffim.cfg | 14 -------------- 4 files changed, 16 insertions(+), 15 deletions(-) create mode 100644 lsst_ip_diffim.pc.in delete mode 100644 ups/ip_diffim.cfg diff --git a/.gitignore b/.gitignore index 30779b93a..941d499d9 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,6 @@ tests/SpatialModelVisitors_1 tests/basisSetRegMatrix .coverage* python/*.dist-info/ + +# Generated by sconsUtils from lsst_ip_diffim.pc.in +lib/pkgconfig/ diff --git a/SConstruct b/SConstruct index dd17de47d..072744cca 100644 --- a/SConstruct +++ b/SConstruct @@ -1,3 +1,3 @@ # -*- python -*- from lsst.sconsUtils import scripts -scripts.BasicSConstruct("ip_diffim") +scripts.BasicSConstruct("ip_diffim", noCfgFile=True) diff --git a/lsst_ip_diffim.pc.in b/lsst_ip_diffim.pc.in new file mode 100644 index 000000000..1c7ea9cfe --- /dev/null +++ b/lsst_ip_diffim.pc.in @@ -0,0 +1,12 @@ +prefix=${pcfiledir}/../.. +includedir=${prefix}/include +libdir=${prefix}/lib +doxygen_tag=${prefix}/doc/ip_diffim.tag +lsst_build_requires=boost_timer pybind11 python3 + +Name: lsst_ip_diffim +Description: LSST Science Pipelines image differencing +Version: @VERSION@ +Requires: lsst_meas_base lsst_afw numpy minuit2 lsst_log lsst_daf_base +Cflags: -I${includedir} +Libs: -L${libdir} -lip_diffim diff --git a/ups/ip_diffim.cfg b/ups/ip_diffim.cfg deleted file mode 100644 index 09367a98e..000000000 --- a/ups/ip_diffim.cfg +++ /dev/null @@ -1,14 +0,0 @@ -# -*- python -*- - -import lsst.sconsUtils - -dependencies = { - "required": ["meas_base", "afw", "numpy", "minuit2", "log", "daf_base"], - "buildRequired": ["boost_timer", "pybind11"], -} - -config = lsst.sconsUtils.Configuration( - __file__, - headers=["lsst/ip/diffim.h"], - hasDoxygenInclude=False, -)