[Git][freetype/freetype][master] meson: Use the standard dependency mechanism to find bzip2

[Alexei Podtelezhnikov (@apodtele)]

Alexei Podtelezhnikov pushed to branch master at FreeType / FreeType

Commits:

• 2cc58904
  by Jordan Williams at 2024-03-04T12:46:19-06:00

  meson: Use the standard dependency mechanism to find bzip2
  
  This follows standard conventions in Meson by using the pkg-config file.
  This change allows Conan to switch to the Meson build system.
  

1 changed file:

• meson.build

Changes:

meson.build

---

...	...	@@ -316,8 +316,10 @@ else
316	316	endif
317	317
318	318	# BZip2 support
319		-bzip2_dep = cc.find_library('bz2',
320		- required: get_option('bzip2'))
	319	+bzip2_dep = dependency('bzip2', required: false)
	320	+if not bzip2_dep.found()
	321	+ bzip2_dep = cc.find_library('bz2', has_headers: ['bzlib.h'], required: get_option('bzip2'))
	322	+endif
321	323
322	324	if bzip2_dep.found()
323	325	ftoption_command += ['--enable=FT_CONFIG_OPTION_USE_BZIP2']

—
View it on GitLab.
You're receiving this email because of your account on gitlab.freedesktop.org. Manage all notifications · Help