Skip to content

Commit

Permalink
Added the compile_args and link_args variables to the pkg-config …
Browse files Browse the repository at this point in the history
…file generation to be orthogonal with the subproject dependency objects
  • Loading branch information
dragonmux committed Mar 6, 2024
1 parent 506f968 commit 2a3285a
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 2 deletions.
8 changes: 7 additions & 1 deletion crunch++/meson.build
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# SPDX-License-Identifier: LGPL-3.0-or-later

libCrunchppSrc = [
'argsParser.cxx', 'stringFuncs.cxx', 'logger.cxx', 'tester.cxx', 'core.cxx'
]
Expand Down Expand Up @@ -61,7 +63,11 @@ pkgconfig.generate(
name: 'crunch++',
filebase: 'crunch++',
version: meson.project_version(),
description: 'crunch++ is a unit testing framework for C++'
description: 'crunch++ is a unit testing framework for C++',
variables: {
'compile_args': '-I${includedir}',
'link_args': '-L${libdir} -lcrunch++',
},
)

install_headers('crunch++.h')
Expand Down
8 changes: 7 additions & 1 deletion crunch/meson.build
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# SPDX-License-Identifier: LGPL-3.0-or-later

libCrunchSrc = [
'ArgsParser.c', 'StringFuncs.c', 'Logger.c', 'Core.c'
]
Expand Down Expand Up @@ -74,7 +76,11 @@ pkgconfig.generate(
name: 'crunch',
filebase: 'crunch',
version: meson.project_version(),
description: 'crunch is a unit testing framework for C'
description: 'crunch is a unit testing framework for C',
variables: {
'compile_args': '-I${includedir}',
'link_args': '-L${libdir} -lcrunch',
},
)

install_headers('crunch.h')
Expand Down
2 changes: 2 additions & 0 deletions crunchMake/meson.build
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# SPDX-License-Identifier: LGPL-3.0-or-later

crunchMakeSrc = ['crunchMake.cpp']
if isWindows and isMSVC
crunchMakeSrc += ['compilerWindows.cxx']
Expand Down
2 changes: 2 additions & 0 deletions meson.build
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# SPDX-License-Identifier: LGPL-3.0-or-later

project(
'crunch',
['c', 'cpp'],
Expand Down

0 comments on commit 2a3285a

Please sign in to comment.