espressif/Unity
1
0
Fork 0
mirror of https://github.com/ThrowTheSwitch/Unity.git synced 2025-07-04 08:50:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #662 from nirs/skip-subproject-install

Browse Source 
Don't install anything when building as subproject
This commit is contained in:
Mark VanderVoord
2023-02-21 09:28:05 -05:00
committed by GitHub
parent 0854f3d2d5 18482abd9e
commit f9879bf7d8
4 changed files with 30 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
extras/fixture/src/meson.build
View File

@ -1,8 +1,10 @@
unity_inc += include_directories('.') unity_inc += include_directories('.')
unity_src += files('unity_fixture.c') unity_src += files('unity_fixture.c')
install_headers( if not meson.is_subproject()
'unity_fixture.h', install_headers(
'unity_fixture_internals.h', 'unity_fixture.h',
subdir: meson.project_name() 'unity_fixture_internals.h',
) subdir: meson.project_name()
)
endif

10
extras/memory/src/meson.build
View File

@ -1,7 +1,9 @@
unity_inc += include_directories('.') unity_inc += include_directories('.')
unity_src += files('unity_memory.c') unity_src += files('unity_memory.c')
install_headers( if not meson.is_subproject()
'unity_memory.h', install_headers(
subdir: meson.project_name() 'unity_memory.h',
) subdir: meson.project_name()
)
endif

18
meson.build
View File

@ -45,7 +45,7 @@ endif
unity_lib = static_library(meson.project_name(), unity_lib = static_library(meson.project_name(),
sources: unity_src, sources: unity_src,
include_directories: unity_inc, include_directories: unity_inc,
install: true install: not meson.is_subproject(),
) )
unity_dep = declare_dependency( unity_dep = declare_dependency(
@ -54,13 +54,15 @@ unity_dep = declare_dependency(
) )
# Generate pkg-config file. # Generate pkg-config file.
pkg = import('pkgconfig') if not meson.is_subproject()
pkg.generate( pkg = import('pkgconfig')
name: meson.project_name(), pkg.generate(
version: meson.project_version(), name: meson.project_name(),
libraries: [ unity_lib ], version: meson.project_version(),
description: 'C Unit testing framework.' libraries: [ unity_lib ],
) description: 'C Unit testing framework.'
)
endif
# Create a generator that can be used by consumers of our build system to generate # Create a generator that can be used by consumers of our build system to generate
# test runners. # test runners.

12
src/meson.build
View File

@ -8,8 +8,10 @@
unity_inc += include_directories('.') unity_inc += include_directories('.')
unity_src += files('unity.c') unity_src += files('unity.c')
install_headers( if not meson.is_subproject()
'unity.h', install_headers(
'unity_internals.h', 'unity.h',
subdir: meson.project_name() 'unity_internals.h',
) subdir: meson.project_name()
)
endif