Skip to content

Commit

Permalink
imgui: tweak frameworks lists
Browse files Browse the repository at this point in the history
  • Loading branch information
valgur committed Sep 23, 2024
1 parent e3799e5 commit 4e686f8
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 4 deletions.
14 changes: 12 additions & 2 deletions recipes/imgui/all/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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")
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()
Expand All @@ -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 Carbon" "-framework GameController")
target_link_libraries(imgui-osx INTERFACE
"-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()
Expand Down
4 changes: 2 additions & 2 deletions recipes/imgui/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -298,10 +298,10 @@ def _add_binding(name, requires=None, system_libs=None, frameworks=None):
_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"])
_add_binding("metal", frameworks=["Foundation", "Metal", "QuartzCore"])
_add_binding("opengl2", requires=["opengl::opengl"])
_add_binding("opengl3", requires=["opengl::opengl"])
_add_binding("osx", frameworks=["Cocoa", "Carbon", "GameController"])
_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"])
Expand Down

0 comments on commit 4e686f8

Please sign in to comment.