Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ jobs:
run: |
make CXXFLAGS="-Werror" LIBRARY_TYPE=static BUILD_DIR=meson-build-static
make CXXFLAGS="-Werror" LIBRARY_TYPE=shared BUILD_DIR=meson-build-shared
make CXXFLAGS="-Werror" LIBRARY_TYPE=static MESON_SETUP_ARGS="--buildtype debugoptimized -Db_sanitize=address,undefined -Db_lundef=true" BUILD_DIR=meson-build-static-debopt-ubasan
Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
make CXXFLAGS="-Werror" LIBRARY_TYPE=static MESON_SETUP_ARGS="--buildtype debugoptimized -Db_sanitize=address,undefined -Db_lundef=true" BUILD_DIR=meson-build-static-debopt-ubasan
make CXXFLAGS="-Werror" LIBRARY_TYPE=static MESON_SETUP_ADDITIONAL_ARGS="--buildtype debugoptimized -Db_sanitize=address,undefined -Db_lundef=true" BUILD_DIR=meson-build-static-debug


# Check for memory leaks.
# I run this only on linux because osx returns errors from
Expand Down Expand Up @@ -149,4 +150,3 @@ jobs:
if [ ${{ matrix.deploy-sdist }} == "true" ]; then
python -m twine upload --skip-existing sdist/edlib-*.tar.gz
fi

5 changes: 4 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
BUILD_DIR ?= meson-build
# Can be 'static' or 'shared'.
LIBRARY_TYPE ?= static
# Additional arguments for meson setup
MESON_SETUP_ARGS ?=
Comment on lines +4 to +5
Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
# Additional arguments for meson setup
MESON_SETUP_ARGS ?=
MESON_SETUP_ADDITIONAL_ARGS ?=

TEST_DATA_DIR ?= apps/aligner/test_data

YELLOW = \033[33m
Expand All @@ -21,7 +23,8 @@ configure:
rm -rf ${BUILD_DIR}
meson setup ${BUILD_DIR} . \
--backend=ninja \
-Ddefault_library=${LIBRARY_TYPE}
-Ddefault_library=${LIBRARY_TYPE} \
${MESON_SETUP_ARGS}
Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
${MESON_SETUP_ARGS}
${MESON_SETUP_ADDITIONAL_ARGS}


build:
meson compile -v -C ${BUILD_DIR}
Expand Down
Loading