Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add shared library support when building with meson #2918

Open
wants to merge 2 commits into
base: devel
Choose a base branch
from
Open

Add shared library support when building with meson #2918

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e9c36da
Implement default_library option
Colum31 Oct 11, 2024
c8b394e
Use library() instead of static_library()
Colum31 Oct 11, 2024
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
1 change: 1 addition & 0 deletions meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
project(
'catch2',
'cpp',
default_options: ['default_library=static'],
version: '3.7.1', # CML version placeholder, don't delete
license: 'BSL-1.0',
meson_version: '>=0.54.1',
Expand Down
4 changes: 2 additions & 2 deletions src/catch2/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@ if ((host_machine.system() == 'android') or
catch2_dependencies += log_dep
endif

catch2 = static_library(
catch2 = library(
'Catch2',
sources,
dependencies: catch2_dependencies,
Expand All @@ -371,7 +371,7 @@ pkg.generate(
url: 'https://github.com/catchorg/Catch2',
)

catch2_with_main = static_library(
catch2_with_main = library(
'Catch2Main',
'internal/catch_main.cpp',
link_with: catch2,
Expand Down