motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-06 01:03:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

configure: move cocoa option to Meson

Browse source 
While detection of the framework was already there, moving
the option allows for better error reporting.

Reported-by: Christophe de Dinechin <dinechin@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2020-09-01 11:28:59 -04:00
parent 84ec0c2435
commit b4e312e953
4 changed files with 17 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

9
meson.build
View file

@ -101,7 +101,7 @@ socket = []
version_res = []
coref = []
iokit = []
cocoa = []
cocoa = not_found
hvf = []
if targetos == 'windows'
socket = cc.find_library('ws2_32')
@ -114,7 +114,7 @@ if targetos == 'windows'
elif targetos == 'darwin'
coref = dependency('appleframeworks', modules: 'CoreFoundation')
iokit = dependency('appleframeworks', modules: 'IOKit')
cocoa = dependency('appleframeworks', modules: 'Cocoa')
cocoa = dependency('appleframeworks', modules: 'Cocoa', required: get_option('cocoa'))
hvf = dependency('appleframeworks', modules: 'Hypervisor')
elif targetos == 'sunos'
socket = [cc.find_library('socket'),
@ -126,6 +126,10 @@ elif targetos == 'haiku'
cc.find_library('bsd')]
endif
if not cocoa.found() and get_option('cocoa').enabled()
error('Cocoa not available on this platform')
endif
################
# Dependencies #
################
@ -536,6 +540,7 @@ endif
# Create config-host.h
config_host_data.set('CONFIG_COCOA', cocoa.found())
config_host_data.set('CONFIG_LIBUDEV', libudev.found())
config_host_data.set('CONFIG_MPATH', mpathpersist.found())
config_host_data.set('CONFIG_MPATH_NEW_API', mpathpersist_new_api)