[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH] meson: Restrict Cocoa framework check to macOS
From: |
Philippe Mathieu-Daudé |
Subject: |
Re: [PATCH] meson: Restrict Cocoa framework check to macOS |
Date: |
Tue, 26 Jan 2021 14:47:09 +0100 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.6.0 |
On 1/26/21 2:28 PM, Peter Maydell wrote:
> On Tue, 26 Jan 2021 at 13:26, Philippe Mathieu-Daudé <philmd@redhat.com>
> wrote:
>>
>> Do not check for Cocoa framework if the OS is not macOS.
>>
>> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>> ---
>> meson.build | 5 ++++-
>> 1 file changed, 4 insertions(+), 1 deletion(-)
>>
>> diff --git a/meson.build b/meson.build
>> index 35a9eddf5cf..9a9ee5408b9 100644
>> --- a/meson.build
>> +++ b/meson.build
>> @@ -369,7 +369,10 @@
>> endif
>> endif
>>
>> -cocoa = dependency('appleframeworks', modules: 'Cocoa', required:
>> get_option('cocoa'))
>> +cocoa = not_found
>> +if targetos == 'darwin'
>> + cocoa = dependency('appleframeworks', modules: 'Cocoa', required:
>> get_option('cocoa'))
>> +endif
>> if cocoa.found() and get_option('sdl').enabled()
>> error('Cocoa and SDL cannot be enabled at the same time')
>> endif
>
> What difference does this change make?
On my slow Fedora host it run cmake checks if it can build cocoa.
> Are there ever
> situations where the 'detect cocoa' test incorrectly
> finds cocoa on a non-macOS system and breaks something?
In my case it is not breaking, just slow. The host is slow anyway,
making it more apparent.
>
> thanks
> -- PMM
>