From e2e354a9ff3c4489c7095dc7cf4f821a975165df 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_meas_algorithms.pc.in | 12 ++++++++++++ ups/meas_algorithms.cfg | 15 --------------- 4 files changed, 16 insertions(+), 16 deletions(-) create mode 100644 lsst_meas_algorithms.pc.in delete mode 100644 ups/meas_algorithms.cfg diff --git a/.gitignore b/.gitignore index 4c2e83954..6de4e9bf0 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,6 @@ python/lsst/meas/algorithms/version.py pytest_session.txt .coverage* python/*.dist-info/ + +# Generated by sconsUtils from lsst_meas_algorithms.pc.in +lib/pkgconfig/ diff --git a/SConstruct b/SConstruct index 8a5fa2679..73b309cd8 100644 --- a/SConstruct +++ b/SConstruct @@ -1,3 +1,3 @@ # -*- python -*- from lsst.sconsUtils import scripts -scripts.BasicSConstruct("meas_algorithms") +scripts.BasicSConstruct("meas_algorithms", noCfgFile=True) diff --git a/lsst_meas_algorithms.pc.in b/lsst_meas_algorithms.pc.in new file mode 100644 index 000000000..f6fc0fd8a --- /dev/null +++ b/lsst_meas_algorithms.pc.in @@ -0,0 +1,12 @@ +prefix=${pcfiledir}/../.. +includedir=${prefix}/include +libdir=${prefix}/lib +doxygen_tag=${prefix}/doc/meas_algorithms.tag +lsst_build_requires=boost_test pybind11 python3 + +Name: lsst_meas_algorithms +Description: LSST Science Pipelines measurement algorithms +Version: @VERSION@ +Requires: lsst_astshim lsst_cpputils lsst_geom lsst_afw boost_math lsst_pex_config lsst_meas_base minuit2 lsst_shapelet +Cflags: -I${includedir} +Libs: -L${libdir} -lmeas_algorithms diff --git a/ups/meas_algorithms.cfg b/ups/meas_algorithms.cfg deleted file mode 100644 index ebc9fc583..000000000 --- a/ups/meas_algorithms.cfg +++ /dev/null @@ -1,15 +0,0 @@ -# -*- python -*- - -import lsst.sconsUtils - -dependencies = { - "required": ["astshim", "cpputils", "geom", "afw", "boost_math", "pex_config", "meas_base", - "minuit2", "shapelet"], - "buildRequired": ["boost_test", "pybind11"], -} - -config = lsst.sconsUtils.Configuration( - __file__, - headers=["lsst/meas/algorithms.h"], - hasDoxygenInclude=False, -)