Skip to content

Commit 65b5235

Browse files
committed
fix: Change flags in buildconfig
Reverting the introduced change from ca01956. Also moved the flags to ON instead using 1
1 parent b6d5ee4 commit 65b5235

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

python/fdb5lib/buildconfig

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,10 @@
1111
# TODO we duplicate information -- pyproject.toml's `name` and `packages` are derivable from $NAME and must stay consistent
1212

1313
NAME="fdb"
14-
# TODO -DENABLE_GRIB=1 causes build to fail, no idea why, no idea if desired
15-
#
1614
# NOTE zarr interface is dependent on python 3.11+ -- but we dont activate the venv at the time this is sourced, that's why we rely on PYVERSION. Remove this whole part around October 2026 when 3.10 goes EoL
1715
# if [ "True" = "$(python -c 'import sys; print(sys.version_info[0:2] >= (3, 11))')" ] ; then
1816
if [ "3.10" != "$PYVERSION" ] ; then
19-
ZARR_IFACE="-DENABLE_PYTHON_ZARR_INTERFACE=1"
17+
ZARR_IFACE="-DENABLE_PYTHON_ZARR_INTERFACE=ON"
2018
else
2119
>&2 echo "Not enabling zarr interface because python version is $PYVERSION"
2220
ZARR_IFACE=""
@@ -27,12 +25,12 @@ fi
2725
# this whole part around October 2026 when 3.10 goes EoL
2826
# if [ "True" = "$(python -c 'import sys; print(sys.version_info[0:2] >= (3, 11))')" ] ; then
2927
if [ "3.10" != "$PYVERSION" ] ; then
30-
PYFDB_IFACE="-DENABLE_PYTHON_FDB_INTERFACE=1"
28+
PYFDB_IFACE="-DENABLE_PYTHON_FDB_INTERFACE=ON"
3129
else
3230
>&2 echo "Not enabling pyfdb interface because python version is $PYVERSION"
3331
PYFDB_IFACE=""
3432
fi
3533

36-
CMAKE_PARAMS="-Deckit_ROOT=/tmp/fdb/prereqs/eckitlib -Dmetkit_ROOT=/tmp/fdb/prereqs/metkitlib -Deccodes_ROOT=/tmp/fdb/prereqs/eccodeslib -DENABLE_GRIB=0 $ZARR_IFACE $PYFDB_IFACE -DENABLE_FDB_BUILD_TOOLS=ON"
34+
CMAKE_PARAMS="-Deckit_ROOT=/tmp/fdb/prereqs/eckitlib -Dmetkit_ROOT=/tmp/fdb/prereqs/metkitlib -Deccodes_ROOT=/tmp/fdb/prereqs/eccodeslib $ZARR_IFACE $PYFDB_IFACE -DENABLE_FDB_BUILD_TOOLS=ON"
3735
PYPROJECT_DIR="python/fdb5lib"
3836
DEPENDENCIES='["eckitlib", "eccodeslib", "metkitlib"]'

0 commit comments

Comments
 (0)