From 989430c2c8aca86802d9317b84862c02ace1ebc1 Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Mon, 23 Sep 2024 12:32:54 +0300 Subject: [PATCH] imgui: fix required macOS frameworks --- recipes/imgui/all/CMakeLists.txt | 14 ++++++++++++-- recipes/imgui/all/conanfile.py | 4 ++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/recipes/imgui/all/CMakeLists.txt b/recipes/imgui/all/CMakeLists.txt index 99e397da33..3260fecf19 100644 --- a/recipes/imgui/all/CMakeLists.txt +++ b/recipes/imgui/all/CMakeLists.txt @@ -94,7 +94,11 @@ if(IMGUI_IMPL_METAL) enable_language(OBJCXX) add_library(imgui-metal backends/imgui_impl_metal.mm) set_source_files_properties(backends/imgui_impl_metal.mm PROPERTIES COMPILE_FLAGS -fobjc-weak) - target_link_libraries(imgui-metal PRIVATE "-framework Metal" "-framework Cocoa" "-framework QuartzCore") + target_link_libraries(imgui-metal PRIVATE + "-framework Foundation" + "-framework Metal" + "-framework QuartzCore" + ) install(FILES backends/imgui_impl_metal.h DESTINATION include) list(APPEND IMGUI_COMPONENTS imgui-metal) endif() @@ -119,7 +123,13 @@ endif() if(IMGUI_IMPL_OSX) enable_language(OBJCXX) add_library(imgui-osx backends/imgui_impl_osx.mm) - target_link_libraries(imgui-osx INTERFACE "-framework Cocoa" "-framework AppKit") + target_link_libraries(imgui-osx PRIVATE + "-framework AppKit" + "-framework Carbon" + "-framework Cocoa" + "-framework Foundation" + "-framework GameController" + ) install(FILES backends/imgui_impl_osx.h DESTINATION include) list(APPEND IMGUI_COMPONENTS imgui-osx) endif() diff --git a/recipes/imgui/all/conanfile.py b/recipes/imgui/all/conanfile.py index 85c26646f6..96feb2b1bd 100644 --- a/recipes/imgui/all/conanfile.py +++ b/recipes/imgui/all/conanfile.py @@ -289,10 +289,10 @@ class ImguiConan(ConanFile): _add_binding("dx12", system_libs=["d3d12"]) _add_binding("glfw", requires=["glfw::glfw"] if self.settings.os != "Emscripten" else []) _add_binding("glut", requires=["freeglut::freeglut"] if self.settings.os != "Emscripten" else []) - _add_binding("metal", frameworks=["Metal", "Cocoa", "QuartzCore"]) + _add_binding("metal", frameworks=["Foundation", "Metal", "QuartzCore"]) _add_binding("opengl2", requires=["opengl::opengl"]) _add_binding("opengl3", requires=["opengl::opengl"]) - _add_binding("osx", frameworks=["Cocoa", "AppKit"]) + _add_binding("osx", frameworks=["AppKit", "Carbon", "Cocoa", "Foundation", "GameController"]) _add_binding("sdl2", requires=["sdl::sdl"]) _add_binding("sdlrenderer2", requires=["sdl::sdl"]) # _add_binding("sdlrenderer3", requires=["sdl::sdl"])