From 75079bc160462cdd7dab122ea7a935359cbdc555 Mon Sep 17 00:00:00 2001 From: Adel KARA SLIMANE Date: Sun, 6 Oct 2024 00:08:12 +0200 Subject: [PATCH] meson: add macos specific tweaks Treat files as Objective-C++ instead of C++ because some included macos headers are Objective-C++ Objective-C++ apparently is a superset of C++ so we should be all good --- meson.build | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/meson.build b/meson.build index 703881c0df5..1551e65f4c3 100644 --- a/meson.build +++ b/meson.build @@ -262,11 +262,16 @@ if host_machine.system() == 'linux' subdir: 'openframeworks' ) +elif host_machine.system() == 'darwin' + + deps += [dependency('appleframeworks', modules : ['AppKit', 'Foundation', 'AVKit', 'GLKit'])] + add_project_arguments('-ObjC++', language: 'cpp') + endif -# We need to treat this dependency independently +# We need to treat this dependency independently # because if it's not installed in the host system, -# we will use the .wrap file in the subprojects file AND +# we will use the .wrap file in the subprojects file AND # need to change a define in the cmake subproject uriparser_dep = dependency('uriparser', required: false) if not uriparser_dep.found() @@ -298,7 +303,7 @@ freeimage_dep = compiler.find_library('freeimage', has_headers: ['FreeImage.h'], if not freeimage_dep.found() freeimage_opts = cmake.subproject_options() # doesn't compile with the define bellow - # freeimage_opts.add_cmake_defines({'BUILD_SHARED_LIBS': true}) + # freeimage_opts.add_cmake_defines({'BUILD_SHARED_LIBS': true}) # We need -fPIC to link against the produced static library freeimage_opts.add_cmake_defines({'CMAKE_POSITION_INDEPENDENT_CODE': true}) freeimage_proj = cmake.subproject('freeimage', options: freeimage_opts) @@ -311,7 +316,8 @@ lib = library('openFrameworks', sources, include_directories: inc, dependencies: deps, - install: true) + install: true, +) openframeworks_dep = declare_dependency(link_with: lib, include_directories: inc, dependencies: deps)