From 108fe84e7e2614ae847b2567c724cade4e95f0a0 Mon Sep 17 00:00:00 2001 From: Jussi Pakkanen Date: Sat, 7 Aug 2021 19:42:05 +0300 Subject: Update iphone cross building. --- test cases/osx/4 framework/meson.build | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) (limited to 'test cases') diff --git a/test cases/osx/4 framework/meson.build b/test cases/osx/4 framework/meson.build index 460b48074..859d34e85 100644 --- a/test cases/osx/4 framework/meson.build +++ b/test cases/osx/4 framework/meson.build @@ -8,16 +8,23 @@ # - "stat@sta" should be only "OpenGL.framework" # see "xcode-frameworks.png" for an example -project('xcode framework test', 'c', default_options : ['libdir=libtest']) - -dep_libs = dependency('appleframeworks', modules : ['OpenGL'], required : false) -if not dep_libs.found() - error('OpenGL framework not found') -endif -assert(dep_libs.type_name() == 'appleframeworks', 'type_name is wrong') +project('xcode framework test', 'objc', default_options : ['libdir=libtest']) dep_main = dependency('appleframeworks', modules : ['Foundation']) -stlib = static_library('stat', 'stat.c', install : true, dependencies: dep_libs) -exe = executable('prog', 'prog.c', install : true, dependencies: dep_main) - +if meson.is_cross_build() + # This is only available in iOS, not macOS. Just test finding it. + uikit_dep = dependency('appleframeworks', modules: 'UIKit') +else + dep_libs = dependency('appleframeworks', modules : ['OpenGL'], required : false) + if not dep_libs.found() + error('OpenGL framework not found') + endif + assert(dep_libs.type_name() == 'appleframeworks', 'type_name is wrong') + stlib = static_library('stat', 'stat.c', install : true, dependencies: dep_libs) + exe = executable('prog', 'prog.c', install : true, dependencies: dep_main) + uikit_dep = dependency('appleframeworks', modules: 'UIKit', required: false) + if uikit_dep.found() + error('UIKit found on macOS even though it should not be there.') + endif +endif -- cgit v1.2.3