Skip to content

[build] Use appropriate CMake to link against MacOS framework #21013

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vepadulano merged 1 commit into from
Jan 24, 2026
+14 −6
Merged

[build] Use appropriate CMake to link against MacOS framework #21013

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions core/macosx/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,18 @@ if(NOT APPLE)
return()
endif()

find_library(CORESYMBOLICATION_FRAMEWORK CoreSymbolication PATHS "${CMAKE_OSX_SYSROOT}/System/Library/PrivateFrameworks" REQUIRED)
target_link_libraries(Core PRIVATE
"-F/System/Library/PrivateFrameworks -framework CoreSymbolication"
${CORESYMBOLICATION_FRAMEWORK}
)

if(cocoa)
set_property(TARGET Core APPEND PROPERTY DICT_HEADERS TMacOSXSystem.h)

target_include_directories(Core PRIVATE inc)

target_link_libraries(Core PRIVATE "-framework Cocoa")
find_library(COCOA_FRAMEWORK Cocoa REQUIRED)
target_link_libraries(Core PRIVATE ${COCOA_FRAMEWORK})

ROOT_OBJECT_LIBRARY(Macosx
src/CocoaUtils.mm
Expand Down
7 changes: 5 additions & 2 deletions graf2d/cocoa/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@
# @author Pere Mato, CERN
############################################################################

find_library(COCOA_FRAMEWORK Cocoa REQUIRED)
find_library(OPENGL_FRAMEWORK OpenGL REQUIRED)

ROOT_STANDARD_LIBRARY_PACKAGE(GCocoa
HEADERS
TGCocoa.h
Expand Down Expand Up @@ -36,8 +39,8 @@ ROOT_STANDARD_LIBRARY_PACKAGE(GCocoa
Gui
LIBRARIES
GQuartz
"-framework Cocoa"
"-framework OpenGL"
${COCOA_FRAMEWORK}
${OPENGL_FRAMEWORK}
${FREETYPE_LIBRARIES}
)

Expand Down
4 changes: 3 additions & 1 deletion graf2d/quartz/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@

add_definitions("-ObjC++")

find_library(COCOA_FRAMEWORK Cocoa REQUIRED)

# Dictionary not needed.
ROOT_LINKER_LIBRARY(GQuartz
src/QuartzFillArea.mm
Expand All @@ -19,7 +21,7 @@ ROOT_LINKER_LIBRARY(GQuartz
src/QuartzText.mm
src/QuartzUtils.mm
LIBRARIES
"-framework Cocoa"
${COCOA_FRAMEWORK}
DEPENDENCIES
Core
MathCore
Expand Down
3 changes: 2 additions & 1 deletion gui/cefdisplay/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ if(ROOT_ARCHITECTURE MATCHES macosx)
set(CEF_platform src/gui_handler_mac.mm)
set(CEF_RELEASE_DIR ${CEF_root}/Release/Chromium\ Embedded\ Framework.framework)
set(CEF_LIBRARY ${CEF_RELEASE_DIR}/Chromium\ Embedded\ Framework)
set(CEF_LIB_DEPENDENCY "-framework Foundation")
find_library(FOUNDATION_FRAMEWORK Foundation REQUIRED)
set(CEF_LIB_DEPENDENCY ${FOUNDATION_FRAMEWORK})
set(CEF_DLL_WRAPPER ${CEF_root}/build/libcef_dll_wrapper/libcef_dll_wrapper.a)
file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/Frameworks/Chromium\ Embedded\ Framework.framework)
file(COPY ${CEF_RELEASE_DIR} DESTINATION ${CMAKE_BINARY_DIR}/Frameworks/)
Expand Down
Loading